Fix #1991

WindowsAzure#1991