Fix hotspots