Fix problem with map events (few events)