Fixed #35 in connectors too