Emi - bug fixed: 3071, 3081