diff --git a/libraries/model-baker/src/model-baker/Baker.cpp b/libraries/model-baker/src/model-baker/Baker.cpp
index f17db7397e..bd39b3178f 100644
--- a/libraries/model-baker/src/model-baker/Baker.cpp
+++ b/libraries/model-baker/src/model-baker/Baker.cpp
@@ -62,13 +62,10 @@ namespace baker {
             indexedTrianglesMeshOut.clear();
             indexedTrianglesMeshOut.resize(meshesIn.size());
 
-            for (int i = 0; i < meshesIn.size(); i++) {
+            for (size_t i = 0; i < meshesIn.size(); i++) {
                 auto& mesh = meshesIn[i];
-
-                auto meshPointer = const_cast<HFMMesh*>(&mesh);
-                meshPointer->_vertices = meshPointer->vertices.toStdVector();
-
-                indexedTrianglesMeshOut[i] = hfm::generateTriangleListMesh(meshPointer->_vertices, mesh.parts);
+                const auto verticesStd = mesh.vertices.toStdVector();
+                indexedTrianglesMeshOut[i] = hfm::generateTriangleListMesh(verticesStd, mesh.parts);
             }
         }
     };