#SCL-5298 Fixed