#SCL-5499 Fixed