Fixed issue EN-108