diff --git a/src/OpMult.cpp b/src/OpMult.cpp
index fb80e39d6..d4c7a4828 100644
--- a/src/OpMult.cpp
+++ b/src/OpMult.cpp
@@ -36,6 +36,7 @@ template<uint32_t tX, uint32_t tY, uint32_t tZ>
 OpMult<tX, tY, tZ>::~OpMult()
 {
     SPDLOG_DEBUG("Kompute OpMult destructor started");
+
 }
 
 template<uint32_t tX, uint32_t tY, uint32_t tZ>
diff --git a/src/OpMult.hpp b/src/OpMult.hpp
index 25a7bf2df..b7cceb725 100644
--- a/src/OpMult.hpp
+++ b/src/OpMult.hpp
@@ -38,11 +38,17 @@ class OpMult : public OpBase
     void postSubmit() override;
 
   private:
+    // Always owned resources
+    std::shared_ptr<Tensor> mTensorOutputStaging;
+
+    // Optionally owned resources
     std::shared_ptr<Algorithm> mAlgorithm;
+    bool mFreeAlgorithm = false;
+
+    // Never owned resources
     std::shared_ptr<Tensor> mTensorLHS;
     std::shared_ptr<Tensor> mTensorRHS;
     std::shared_ptr<Tensor> mTensorOutput;
-    std::shared_ptr<Tensor> mTensorOutputStaging;
 
     uint32_t mX;
     uint32_t mY;