EM-0001 BUGFIX for eventmodel