diff --git a/cpp/visualmesh/engine/cpu/engine.hpp b/cpp/visualmesh/engine/cpu/engine.hpp
index 9fc76e6..f69e9b9 100644
--- a/cpp/visualmesh/engine/cpu/engine.hpp
+++ b/cpp/visualmesh/engine/cpu/engine.hpp
@@ -269,7 +269,7 @@ namespace engine {
                 return ClassifiedMesh<Scalar, N_NEIGHBOURS>{std::move(projected.pixel_coordinates),
                                                             std::move(projected.neighbourhood),
                                                             std::move(projected.global_indices),
-                                                            input};
+                                                            std::move(input)};
             }
 
             /**
diff --git a/cpp/visualmesh/visualmesh.hpp b/cpp/visualmesh/visualmesh.hpp
index 4804765..85d7da8 100644
--- a/cpp/visualmesh/visualmesh.hpp
+++ b/cpp/visualmesh/visualmesh.hpp
@@ -133,7 +133,7 @@ class VisualMesh {
         return std::abs(it->first - height) < std::abs(std::prev(it)->first - height) ? it->second
                                                                                       : std::prev(it)->second;
     }
-
+    //
     /**
      * Performs a visual mesh lookup using the description of the lens provided to find visual mesh points on the image.
      *
@@ -148,7 +148,7 @@ class VisualMesh {
         // z height from the transformation matrix
         const Scalar& h = Hoc[2][3];
         auto mesh       = height(h);
-        return mesh->lookup(Hoc, lens);
+        return std::make_pair(mesh, mesh.lookup(Hoc, lens));
     }
 
 private: