Merge pull request #194 from ddunbar/core-cancellation-is-incomplete

[Core] Fix a corner case in cancellation logic.