Fix for cancelling mid-deployment