EES-15016 Fixed gem to support EM correctly