Fix/en 39and41

Fixed:  EN-41
Improvement:  EN-39