#JC-1494 Fixed after code review