Revert "Revert "Networking Fixed issue #73""

This reverts commit f280b4024045e75d7686fcb022e273116e629ab7.