fix map events removal