JBTM-2110 reduce number of iterations