LB-1842: additional fix