fixes bugs in connector & factories