Fixed codeplex issue 24176
Merge pull request #347 from kenkendk/master

Fixed codeplex issue 24176