Proposed fix for issue #1475
https://github.com/WindowsAzure/azure-sdk-tools/issues/1475