Connection fix