Emi - fixed bug 3072, 3073