Issue #201 - Improve cancel event detection