Fix randomization of values with labels.

macros/parsers/parserPopUp.pl

@@ -269,16 +269,16 @@ sub addLabelsValues {
 	my $self    = shift;
 	my $choices = $self->{orderedChoices};
 	my $labels  = [];
-	my $values  = $self->{values};
 	my $n       = $self->{n};
+	my $values  = [ (undef) x $n ];
 
 	foreach my $i (0 .. $n - 1) {
 		if (ref($choices->[$i]) eq "HASH") {
 			$labels->[$i] = (keys %{ $choices->[$i] })[0];
 			$values->[$i] = $choices->[$i]{ $labels->[$i] };
 		} else {
 			$labels->[$i] = $choices->[$i];
-			$values->[$i] = $choices->[$i] unless (defined($values->[$i]) && $values->[$i] ne '');
+			$values->[$i] = $self->{values}[ $self->{order}[$i] ] // $choices->[$i];
 		}
 
 	}