Fixed compatibility with connect API