diff --git a/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp b/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp
index 4f7400c2f486215774ac45e2a6230e6a4996ebb9..a8c58b4aee855fad6c6329357bace107f44c143e 100644
--- a/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp
+++ b/source/RobotAPI/libraries/skills_gui/executions/SkillExecutionTreeWidget.cpp
@@ -21,7 +21,7 @@ namespace armarx::skills::gui
         // Stop skill
         QAction* stopSkillAction = new QAction("Stop execution", this);
         const auto& executions = memory->fetchExecutions();
-        if (!executions.contains(selectedExecution.skillExecutionId))
+        if (executions.count(selectedExecution.skillExecutionId) == 0)
             return;
         skills::SkillStatus currentStatus =
             memory->fetchExecutions().at(selectedExecution.skillExecutionId).status;
@@ -64,7 +64,7 @@ namespace armarx::skills::gui
         if (executions.empty())
             return;
 
-        if (!executions.contains(currentExecutionId))
+        if (executions.count(currentExecutionId) == 0)
         {
             // we didn't find an entry for the execution id
             ARMARX_IMPORTANT << "The selected execution was not found in memory. The GUI is unable "
diff --git a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp
index a38eeb9790b820fc5a3ea6148a4cf52b71784252..f6c9c04b052bf38ce3dbea81037652e98795d02d 100644
--- a/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp
+++ b/source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsTreeWidget.cpp
@@ -93,8 +93,8 @@ namespace armarx::skills::gui
 
         // maybe the search is empty?
         auto skillsMap = memory->fetchSkills();
-        if (!skillsMap.contains(sid.providerId.value()) ||
-            !skillsMap.at(sid.providerId.value()).contains(sid))
+        if (skillsMap.count(sid.providerId.value()) == 0 ||
+            skillsMap.at(sid.providerId.value()).count(sid) == 0)
         {
             this->resetWidget();
             return;
diff --git a/source/RobotAPI/libraries/skills_gui/skills/SkillTreeWidget.cpp b/source/RobotAPI/libraries/skills_gui/skills/SkillTreeWidget.cpp
index 29b9fb1800b4c4991198bff61a492b6fd0f436b0..16655613a5eebe349eab6b8f6694f44914a33636 100644
--- a/source/RobotAPI/libraries/skills_gui/skills/SkillTreeWidget.cpp
+++ b/source/RobotAPI/libraries/skills_gui/skills/SkillTreeWidget.cpp
@@ -54,7 +54,7 @@ namespace armarx::skills::gui
             ++i;
 
             // sanity check
-            ARMARX_CHECK(skills.contains(providerId));
+            ARMARX_CHECK(skills.count(providerId) > 0);
             auto& providedSkills = skills.at(providerId);
 
             int j = 0;