Emi - Fix changed