Fixed SCL-7239