Fixed Heatmap bug