BZ-12454 Fixed cancel handling