#SCL-5283 Fixed