EMA bug fixed