diff --git a/src/FirmwarePlugin/FirmwarePlugin.cc b/src/FirmwarePlugin/FirmwarePlugin.cc
index 18c5ea97afbc88d6a768caceafd01d005ae94723..d43a0306530c6054e4afa19b911e8ff9260ca16a 100644
--- a/src/FirmwarePlugin/FirmwarePlugin.cc
+++ b/src/FirmwarePlugin/FirmwarePlugin.cc
@@ -212,7 +212,9 @@ void FirmwarePlugin::guidedModeChangeAltitude(Vehicle* vehicle, double altitudeR
 
 const FirmwarePlugin::remapParamNameMajorVersionMap_t& FirmwarePlugin::paramNameRemapMajorVersionMap(void) const
 {
-    return remapParamNameMajorVersionMap_t();
+    static const remapParamNameMajorVersionMap_t remap;
+
+    return remap;
 }
 
 int FirmwarePlugin::remapParamNameHigestMinorVersionNumber(int majorVersionNumber) const