Added temporary fix for thrustless motion