Emi - Bugs fixed

version: 1.4.0.133