Fix Connection check