fixed TESB-9353 on Runtime side