Fix #1991
WindowsAzure#1991
Merge pull request #2075 from ogail/1991

Fix #1991