diff --git a/include/caosdb/entity.h b/include/caosdb/entity.h
index f4175120263332c74a21a4b8e4446696bf1d7c7b..7aa63fec21569c68660a4e1c0cad71882f2cff3f 100644
--- a/include/caosdb/entity.h
+++ b/include/caosdb/entity.h
@@ -304,7 +304,7 @@ private:
  */
 class Property {
 public:
-  explicit inline Property(ProtoProperty *wrapped) : wrapped(wrapped) {
+  explicit inline Property(ProtoProperty *wrapped) : wrapped(wrapped), data_type(nullptr), value(nullptr) {
     data_type.wrapped = this->wrapped->mutable_data_type();
     value.wrapped = this->wrapped->mutable_value();
   };
@@ -449,9 +449,10 @@ class Entity {
 public:
   Entity();
   inline Entity(const Entity &original)
-    : wrapped(CreateProtoEntity()), data_type(nullptr) {
+    : wrapped(CreateProtoEntity()), data_type(nullptr), value(nullptr) {
     this->wrapped->CopyFrom(*original.wrapped);
     data_type.wrapped = this->wrapped->mutable_data_type();
+    value.wrapped = this->wrapped->mutable_value();
     properties.wrapped = this->wrapped->mutable_properties();
     parents.wrapped = this->wrapped->mutable_parents();
     errors.wrapped = CreateMessagesField();
@@ -538,6 +539,7 @@ public:
   auto SetValue(const Value &value) -> StatusCode;
   auto SetValue(const std::string &value) -> StatusCode;
   auto SetValue(const double value) -> StatusCode;
+  // TODO(tf)
   // auto SetValue(const int64_t value) -> StatusCode;
   // auto SetValue(const bool value) -> StatusCode;