fix handling of samples with trailing fields missing