Fixed TLW-1816 upto page 33