Merge pull request #695 from bhariharan/smart_sync

Cleaning up incorrect network field computation