#JC-1581 fix