#JC-1275 correcting after code review by masyan