Fix duplicate registration of map events