Connector bugfix