Fixed codeplex issue 24176