Bug Fix for Event Create