ship and boat bugfix