diff --git a/include/SQLiteCpp/Statement.h b/include/SQLiteCpp/Statement.h
index ce95893..17317c1 100644
--- a/include/SQLiteCpp/Statement.h
+++ b/include/SQLiteCpp/Statement.h
@@ -78,9 +78,9 @@ public:
     Statement(const Statement&) = delete;
     Statement& operator=(const Statement&) = delete;
 
+    // TODO: Change Statement move constructor to default
     Statement(Statement&& aStatement) noexcept;
     Statement& operator=(Statement&& aStatement) noexcept = default;
-    // TODO: Change Statement move constructor to default
 
     /// Finalize and unregister the SQL query from the SQLite Database Connection.
     /// The finalization will be done by the destructor of the last shared pointer
@@ -703,7 +703,7 @@ private:
     bool                    mbDone = false;         //!< true when the last executeStep() had no more row to fetch
 
     /// Map of columns index by name (mutable so getColumnIndex can be const)
-    mutable std::map<std::string, int, std::less<>>  mColumnNames;
+    mutable std::map<std::string, int>  mColumnNames;
 };
 
 
diff --git a/src/Statement.cpp b/src/Statement.cpp
index bef22b0..b91de7b 100644
--- a/src/Statement.cpp
+++ b/src/Statement.cpp
@@ -275,7 +275,7 @@ int Statement::getColumnIndex(const char* apName) const
         for (int i = 0; i < mColumnCount; ++i)
         {
             const char* pName = sqlite3_column_name(getPreparedStatement(), i);
-            mColumnNames.emplace(pName, i);
+            mColumnNames[pName] = i;
         }
     }