fixed issue with canceling