Fix (finally?) conenction fallback