Fix for removing events.