#SCL-5242 Fixed