diff --git a/src/core/model/tuple.h b/src/core/model/tuple.h
index 068cfeef2..78abd6da3 100644
--- a/src/core/model/tuple.h
+++ b/src/core/model/tuple.h
@@ -281,14 +281,17 @@ TupleValue<Args...>::DeserializeFromString(std::string value, Ptr<const Attribut
 
     value.erase(value.begin());
     value.pop_back();
-    std::replace(value.data(), value.data() + value.size(), ',', ' ');
 
     std::istringstream iss(value);
     std::vector<Ptr<AttributeValue>> values;
     std::size_t i = 0;
 
-    while (iss >> value)
+    for (std::string elem; std::getline(iss, elem, ',');)
     {
+        // remove leading whitespaces
+        std::istringstream tmp{elem};
+        std::getline(tmp >> std::ws, value);
+
         if (i >= count)
         {
             return false;