fix TESB-10161 from Gang