Fix issue WindowsAzure/#2161