ConnectionMaker Fix