Fix f***ing yaw issue