#SCL-5394 Fixed