diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
index a3fd51f38..e6af06247 100644
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
@@ -167,7 +167,8 @@ ConfigTaskWidget::~ConfigTaskWidget()
     if (m_saveButton) {
         delete m_saveButton;
     }
-    foreach(WidgetBinding * binding, m_widgetBindingsPerWidget) {
+    QSet<WidgetBinding *> deleteSet = m_widgetBindingsPerWidget.values().toSet();
+    foreach(WidgetBinding * binding, deleteSet) {
         if (binding) {
             delete binding;
         }