Fix for Connector