#JC-1261 - bug fixed