diff --git a/bundle/Form/FieldTypeHandler/Country.php b/bundle/Form/FieldTypeHandler/Country.php
index 155f53d..c463357 100644
--- a/bundle/Form/FieldTypeHandler/Country.php
+++ b/bundle/Form/FieldTypeHandler/Country.php
@@ -61,12 +61,10 @@ public function convertFieldValueToForm(Value $value, FieldDefinition $fieldDefi
 
             $keys = array_keys($value->countries);
 
-            return array(
-                $keys[0] => $value->countries[$keys[0]],
-            );
+            return reset($keys);
         }
 
-        return $value->countries;
+        return array_keys($value->countries);
     }
 
     /**
diff --git a/tests/Form/FieldTypeHandler/CountryTest.php b/tests/Form/FieldTypeHandler/CountryTest.php
index 624acac..fa0db91 100644
--- a/tests/Form/FieldTypeHandler/CountryTest.php
+++ b/tests/Form/FieldTypeHandler/CountryTest.php
@@ -39,7 +39,7 @@ public function testConvertFieldValueToForm()
 
         $returnedValue = $country->convertFieldValueToForm($countryValue);
 
-        $this->assertEquals($countries, $returnedValue);
+        $this->assertEquals(['HR'], $returnedValue);
     }
 
     public function testConvertFieldValueToFormMultipleValues()
@@ -88,7 +88,7 @@ public function testConvertFieldValueToFormMultipleValues()
 
         $returnedValue = $country->convertFieldValueToForm($countryValue, $fieldDefinition);
 
-        $this->assertEquals($selectedCountries, $returnedValue);
+        $this->assertEquals(['HR', 'BB'], $returnedValue);
     }
 
     public function testConvertFieldValueToFormSingleValue()
@@ -132,7 +132,7 @@ public function testConvertFieldValueToFormSingleValue()
 
         $returnedValue = $country->convertFieldValueToForm($countryValue, $fieldDefinition);
 
-        $this->assertEquals($selectedCountries, $returnedValue);
+        $this->assertEquals('HR', $returnedValue);
     }
 
     public function testConvertFieldValueToFormWithNoneSelected()