TDQ-9244 fixed issue 3