Connector serious bugfix