Fix event creation