Connection fix #4