Fix problem with repeatedly cancelling a draft

Fixes #1266