fix map events