Fix to the create event problem