#SCL-5492 Fixed