bugfix for cancelling