diff --git a/src/caosadvancedtools/cfood.py b/src/caosadvancedtools/cfood.py
index 892abc49f168d24b6abbf7933176c88bb023382a..d4a2a367898dacd6100c3e3cf0f1d0f8ca8f467a 100644
--- a/src/caosadvancedtools/cfood.py
+++ b/src/caosadvancedtools/cfood.py
@@ -78,9 +78,13 @@ class AbstractCFood(object):
     # move to api?
     def set_property(entity, prop, value):
         # TODO only do something when it is necessary?
+        if isinstance(prop, db.Entity):
+            name = prop.name
+        else:
+            name = prop
 
-        while entity.get_property(prop) is not None:
-            entity.remove_property(prop)
+        while entity.get_property(name) is not None:
+            entity.remove_property(name)
         entity.add_property(prop, value)
 
     @staticmethod