Fix for occassional error on map change