Finally fix conenction fallback