manually merged riding fix from ghostwolf