Fixed issue with stranded empty annotations on cancel