CON-534
Coding Guidline correction