Fixed issue with the BaseCloudConnector patch