fix cancel handling