diff --git a/NodeManager.cpp b/NodeManager.cpp
index c516c4eed5619dc3d9e8d149595a8fde9885979a..72ec15954d19710a9433b914916ccded0ce721f3 100644
--- a/NodeManager.cpp
+++ b/NodeManager.cpp
@@ -3719,9 +3719,11 @@ void NodeManager::process(Request & request) {
     case 37: setReportIntervalMinutes(request.getValueInt()); break;
     case 38: setReportIntervalHours(request.getValueInt()); break;
     case 39: setReportIntervalDays(request.getValueInt()); break;
-    case 40: setBatteryReportSeconds(request.getValueInt()); break;
-    case 41: setBatteryReportHours(request.getValueInt()); break;
-    case 42: setBatteryReportDays(request.getValueInt()); break;
+    #if BATTERY_MANAGER == 1
+      case 40: setBatteryReportSeconds(request.getValueInt()); break;
+      case 41: setBatteryReportHours(request.getValueInt()); break;
+      case 42: setBatteryReportDays(request.getValueInt()); break;
+    #endif
     default: return; 
   }
   _send(_msg.set(function));
@@ -4113,4 +4115,4 @@ void NodeManager::_saveConfig() {
   saveState(EEPROM_SLEEP_1,bit_1);
   saveState(EEPROM_SLEEP_2,bit_2);
   saveState(EEPROM_SLEEP_3,bit_3);
-}
\ No newline at end of file
+}
diff --git a/NodeManager.h b/NodeManager.h
index 2ca463bf0452a2768b9050288ec0f551058fee30..c3bbee9fe09febd99892b57e677b52fd1b27eff7 100644
--- a/NodeManager.h
+++ b/NodeManager.h
@@ -7,7 +7,7 @@
 #include <Arduino.h>
 
 // define NodeManager version
-#define VERSION "1.6-dev"
+#define VERSION "1.6"
 
 /***********************************
    Constants
@@ -1633,4 +1633,4 @@ class NodeManager {
     void _saveConfig();
 };
 
-#endif
\ No newline at end of file
+#endif