Merge pull request #1083 from christianhuening/NetworkInterfaceFix