Heatmap fix 31