Fix for Connector class