1 files changed, 9 insertions, 3 deletions
diff --git a/Bugzilla/Field/ChoiceInterface.pm b/Bugzilla/Field/ChoiceInterface.pm
index a718377c2..894ce00d3 100644
--- a/Bugzilla/Field/ChoiceInterface.pm
+++ b/Bugzilla/Field/ChoiceInterface.pm
@@ -39,11 +39,11 @@ sub FIELD_NAME { return $_[0]->DB_TABLE; }
 sub _check_if_controller {
     my $self = shift;
     my $vis_fields = $self->controls_visibility_of_fields;
-    my $values     = $self->controlled_values;
-    if (@$vis_fields || scalar(keys %$values)) {
+    my $values = $self->controlled_values_array;
+    if (@$vis_fields || @$values) {
         ThrowUserError('fieldvalue_is_controller',
             { value => $self, fields => [map($_->name, @$vis_fields)],
-              vals => $values });
+              vals => $self->controlled_values });
     }
 }
 
@@ -142,6 +142,12 @@ sub controlled_values {
     return $self->{controlled_values};
 }
 
+sub controlled_values_array {
+    my ($self) = @_;
+    my $values = $self->controlled_values;
+    return [map { @{ $values->{$_} } } keys %$values];
+}
+
 sub is_visible_on_bug {
     my ($self, $bug) = @_;