Emi - Bug fixed (noon)