Heatmap fix