fix blanking of ship_ fields, #21327