#JC-1724 - fixed after code review