Fixed for case when the heatmap is off