Fixed continuous connection issue