Fix map issue (no events on the map)