improve fallback connection scheme
Fix broken stuff