Map crash fixed