Emi - Bug fixed (evening)