diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/converter/image/png/PngConverter.cpp b/source/RobotAPI/libraries/armem/server/ltm/base/converter/image/png/PngConverter.cpp
index f2ab4d8db1f0baaf2a2c6524e97e9f17054b88cc..24fc8be1fcf6ac8f274a7319039742cf5f6c9b52 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/base/converter/image/png/PngConverter.cpp
+++ b/source/RobotAPI/libraries/armem/server/ltm/base/converter/image/png/PngConverter.cpp
@@ -15,6 +15,7 @@ namespace armarx::armem::server::ltm::converter::image
         ARMARX_CHECK_NOT_NULL(data);
 
         auto img = aron::converter::AronOpenCVConverter::ConvertToMat(data);
+        cv::cvtColor(img, img, CV_RGB2BGR);
         std::vector<unsigned char> buffer;
         cv::imencode(".png", img, buffer);
         return buffer;
@@ -23,6 +24,7 @@ namespace armarx::armem::server::ltm::converter::image
     aron::data::NDArrayPtr PngConverter::_convert(const std::vector<unsigned char>& data)
     {
         cv::Mat img = cv::imdecode(data, cv::IMREAD_COLOR);
+        cv::cvtColor(img, img, CV_BGR2RGB);
         return aron::converter::AronOpenCVConverter::ConvertFromMat(img);
     }
 }
diff --git a/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp b/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp
index 0dbe6db72f1b167114b0d211c93c3a37c9202d4a..351d0f5ac4ef71a4e2af10a460bb796e227370f5 100644
--- a/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp
+++ b/source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp
@@ -975,6 +975,7 @@ namespace armarx::armem::server::obj::instance
                 std::filesystem::path filename = path->filename();
                 filename.replace_extension();  // Removes extension
 
+                // The check seems useless?
                 if (lockMemory)
                 {
                     commitSceneSnapshot(snapshot.value(), filename.string());