diff --git a/src/Matrix.cpp b/src/Matrix.cpp
index 7bc1975..0d1fad6 100644
--- a/src/Matrix.cpp
+++ b/src/Matrix.cpp
@@ -6,6 +6,7 @@
 #include <cmath>
 #include <cstdlib>
 #include <type_traits>
+#include <cstring>
 
 template <uint8_t rows, uint8_t columns>
 Matrix<rows, columns>::Matrix(float value)
@@ -104,7 +105,7 @@ Matrix<rows, columns>::Sub(const Matrix<rows, columns> &other,
 
 template <uint8_t rows, uint8_t columns>
 template <uint8_t other_columns>
-Matrix<rows, columns> &
+Matrix<rows, other_columns> &
 Matrix<rows, columns>::Mult(const Matrix<columns, other_columns> &other,
                             Matrix<rows, other_columns> &result) const
 {
diff --git a/src/Matrix.hpp b/src/Matrix.hpp
index 644aedf..2dd0d2a 100644
--- a/src/Matrix.hpp
+++ b/src/Matrix.hpp
@@ -67,8 +67,8 @@ public:
    * @param result A buffer to store the result into
    */
   template <uint8_t other_columns>
-  Matrix<rows, columns> &Mult(const Matrix<columns, other_columns> &other,
-                              Matrix<rows, other_columns> &result) const;
+  Matrix<rows, other_columns> &Mult(const Matrix<columns, other_columns> &other,
+                                    Matrix<rows, other_columns> &result) const;
 
   /**
    * @brief Multiply the matrix by a scalar