fixed hotspot bugs