Revert "Revert "Fixed critical parsing bug""
Revert "Revert "Fixed critical parsing bug""

This reverts commit 46872fe5c9b5ee4a6d3803894a5d9cc2ed42b468.

donothingloop/rtl_heatmap,donothingloop/rtl_heatmap,donothingloop/rtl_heatmap