No more crashing on map change with dummy