Yet another attempt to fix the movement.