Fixing create event