Fix create event