Fixed StyleCop issue
Tried to fix gendarme issue