Bug 913896 - Part 2, fix custom event bug.