#SCL-4929 Fixed