#SCL-2440 fixed