Emi - bug fixed