TESB-13614: fixed