Fix MotionMaster