Revert "Fix #67"
Merge pull request #71 from iRail/revert-68-fix-cancel

Revert "Fix #67"