Small hack to make connection toggling work