Fixed up the MotionFrame handling of eventId