Fix issue with losing connect and still deploying. V2.1