Fix bug #1167328 gateway always set
Merge pull request #69 from rickerc/multi-node_gateway-fix

Fix bug #1167328 gateway always set