diff --git a/actions/form/class.Clazz.php b/actions/form/class.Clazz.php
index <HASH>..<HASH> 100644
--- a/actions/form/class.Clazz.php
+++ b/actions/form/class.Clazz.php
@@ -121,8 +121,13 @@ class tao_actions_form_Clazz
 			if(!is_null($element)){
 				
 				//take property values to populate the form
-				$values = $clazz->getPropertyValuesCollection($property);
-				foreach($values->getIterator() as $value){
+                $values = $clazz->getAllPropertyValues($property);
+                if(!$property->isMultiple()){
+                    if(count($values)>1){
+                        $values = array_slice($values, 0, 1);
+                    }
+                }
+				foreach($values as $value){
 					if(!is_null($value)){
 						if($value instanceof core_kernel_classes_Resource){
 							$element->setValue($value->uriResource);
Bug fix on the edit class form
If a property is not multiple, but the value of this one has been overrided in different model.
Take the last (time) one

git-svn-id: <URL>