UC-2678 - simplify code