Emi-refix Bug 2841

partial bug 2839