[WIP] cancel delete fix

continued from #133