Emi - Bug fixed

Item 61