Fix for events being un-set.