diff --git a/src/Mod/CAM/App/Command.cpp b/src/Mod/CAM/App/Command.cpp
index ac8913b754..8b01fd3190 100644
--- a/src/Mod/CAM/App/Command.cpp
+++ b/src/Mod/CAM/App/Command.cpp
@@ -91,7 +91,7 @@ bool Command::has(const std::string& attr) const
 {
     std::string a(attr);
     boost::to_upper(a);
-    return Parameters.count(a) > 0;
+    return Parameters.contains(a);
 }
 
 std::string Command::toGCode(int precision, bool padzero) const
diff --git a/src/Mod/CAM/App/CommandPyImp.cpp b/src/Mod/CAM/App/CommandPyImp.cpp
index 0ed3af7f92..e0d0305e3e 100644
--- a/src/Mod/CAM/App/CommandPyImp.cpp
+++ b/src/Mod/CAM/App/CommandPyImp.cpp
@@ -281,7 +281,7 @@ PyObject* CommandPy::getCustomAttributes(const char* attr) const
     if (satt.length() == 1) {
         if (isalpha(satt[0])) {
             boost::to_upper(satt);
-            if (getCommandPtr()->Parameters.count(satt)) {
+            if (getCommandPtr()->Parameters.contains(satt)) {
                 return PyFloat_FromDouble(getCommandPtr()->Parameters[satt]);
             }
             Py_INCREF(Py_None);