fix a protential network loop bug

Change-Id: Ic4f9d2688da38794b2b7bcf26b5cd586a5d218d6
Merge "fix a protential network loop bug"