Bug fix in connectors code