diff --git a/cpp_utils/include/cpp_utils/ReturnCode.hpp b/cpp_utils/include/cpp_utils/ReturnCode.hpp
index c53c876..6d82a4c 100644
--- a/cpp_utils/include/cpp_utils/ReturnCode.hpp
+++ b/cpp_utils/include/cpp_utils/ReturnCode.hpp
@@ -81,8 +81,8 @@ class ReturnCode
 
 protected:
 
-    //! Link every ReturnCode available with a string to deserialize
-    static const std::map<ReturnCode, std::string> to_string_conversion_;
+    //! Link every ReturnCodeValue available with a string to deserialize
+    static const std::map<ReturnCodeValue, std::string> to_string_conversion_;
 
     //! \c ReturnCode value
     std::uint32_t value_;
diff --git a/cpp_utils/src/cpp/ReturnCode.cpp b/cpp_utils/src/cpp/ReturnCode.cpp
index 5cd1f30..1a04b79 100644
--- a/cpp_utils/src/cpp/ReturnCode.cpp
+++ b/cpp_utils/src/cpp/ReturnCode.cpp
@@ -89,7 +89,7 @@ bool ReturnCode::operator !() const noexcept
     return value_ != ReturnCode::RETCODE_OK;
 }
 
-const std::map<ReturnCode, std::string> ReturnCode::to_string_conversion_ =
+const std::map<ReturnCode::ReturnCodeValue, std::string> ReturnCode::to_string_conversion_ =
 {
     {ReturnCode::RETCODE_OK, "Ok"},
     {ReturnCode::RETCODE_ERROR, "Error"},
@@ -103,7 +103,7 @@ std::ostream& operator <<(
         std::ostream& os,
         const ReturnCode& code)
 {
-    auto it = ReturnCode::to_string_conversion_.find(code);
+    auto it = ReturnCode::to_string_conversion_.find(static_cast<ReturnCode::ReturnCodeValue>((code())));
     assert(it != ReturnCode::to_string_conversion_.end());
     os << "{" << it->second << "}";
     return os;