Fix for Issue WindowsAzure/azure-sdk-tools#2150