#JC-1458 fix after review