Bugfix: use correct data in heatmap