#JC-1349 - fixed after code review