Fixing event namespace issue;