ConnectionChecker fix