Connection hotfix