diff --git a/src/uas/QGCUASParamManager.cc b/src/uas/QGCUASParamManager.cc
index 2bbe1fb61003ac3bac63a836b0c2b9c95aa44524..af62e3916ef8dc997c4f0b4eb6bc5219abb47aa3 100644
--- a/src/uas/QGCUASParamManager.cc
+++ b/src/uas/QGCUASParamManager.cc
@@ -43,10 +43,12 @@ void QGCUASParamManager::requestParameterList()
     }
 
     paramDataModel->forgetAllOnboardParameters();
-    received.clear();
+
     // Clear transmission state
-    transmissionListMode = true;
+    receivedParamsList.clear();
     transmissionListSizeKnown.clear();
+
+    transmissionListMode = true;
     foreach (int key, transmissionMissingPackets.keys())
     {
         transmissionMissingPackets.value(key)->clear();
diff --git a/src/uas/QGCUASParamManager.h b/src/uas/QGCUASParamManager.h
index c6351a6c38b0cf31ff5959261c20fee695c2d93b..f16be9f7b2d4e412b8ff86cc865c049ef973a2c9 100644
--- a/src/uas/QGCUASParamManager.h
+++ b/src/uas/QGCUASParamManager.h
@@ -62,7 +62,7 @@ protected:
     UASParameterDataModel* paramDataModel;///< Shared data model of parameters
 
     // Communications management
-    QVector<bool> received; ///< Successfully received parameters
+    QVector<bool> receivedParamsList; ///< Successfully received parameters
     QMap<int, QList<int>* > transmissionMissingPackets; ///< Missing packets
     QMap<int, QMap<QString, QVariant>* > transmissionMissingWriteAckPackets; ///< Missing write ACK packets
     bool transmissionListMode;       ///< Currently requesting list
diff --git a/src/ui/QGCParamWidget.cc b/src/ui/QGCParamWidget.cc
index 40fc49195a1f5c29c90cda0f5f4b00e27d9fbf28..1cb641fdde04444e18b39b270d03372f69141ff2 100644
--- a/src/ui/QGCParamWidget.cc
+++ b/src/ui/QGCParamWidget.cc
@@ -764,6 +764,7 @@ void QGCParamWidget::setParameters()
         {
             QMap<QString, QVariant>::iterator j;
             for (j = comp->begin(); j != comp->end(); ++j) {
+                //TODO mavlink command for "set parameter list" ?
                 setParameter(compid, j.key(), j.value());
                 parametersSent++;
             }