Revert that change, bad change.
Move the event cancel check down a bit!