event handler fix for cancelled events, misdirections