Commit 2

Handled the double connection issue from client.