CR feedback
Fixing FxCop violation