fixed bugs in create events
merge conflict resolved