Emi - bug fixed (noon)