Fixed MotionWave