diff --git a/lighthub/main.cpp b/lighthub/main.cpp
index 7eddd99..2984084 100644
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -1033,15 +1033,42 @@ int mqttConfigResp(char *as) {
     return 1;
 }
 
+#if defined(__SAM3X8E__)
+
+#define saveBufLen 16000
+void cmdFunctionSave(int arg_cnt, char **args)
+{
+  char* outBuf = (char*) malloc(saveBufLen); /* XXX: Dynamic size. */
+  if (outBuf == NULL)
+    {
+      return;
+    }
+  debugSerial<<F("Saving config to EEPROM..");
+  aJsonStringStream stringStream(NULL, outBuf, saveBufLen);
+  aJson.print(root, &stringStream);
+  int len = strlen(outBuf);
+  outBuf[len++]= EOF;
+  EEPROM.write(EEPROM_offset,(byte*) outBuf,len);
+
+  free (outBuf);
+  debugSerial<<F("Saved to EEPROM");
+}
+
+#else
 void cmdFunctionSave(int arg_cnt, char **args)
 {
     aJsonEEPROMStream jsonEEPROMStream = aJsonEEPROMStream(EEPROM_offset);
     debugSerial<<F("Saving config to EEPROM..");
+
     aJson.print(root, &jsonEEPROMStream);
     jsonEEPROMStream.putEOF();
+
+
     debugSerial<<F("Saved to EEPROM");
 }
 
+#endif
+
 void cmdFunctionIp(int arg_cnt, char **args)
 {
     IPAddress ip0(0, 0, 0, 0);
diff --git a/lighthub/options.h b/lighthub/options.h
index ab076ce..130aa9f 100644
--- a/lighthub/options.h
+++ b/lighthub/options.h
@@ -51,7 +51,7 @@
 #endif
 
 #ifndef MODBUS_DIMMER_PARAM
-#define MODBUS_DIMMER_PARAM SERIAL_8E1
+#define MODBUS_DIMMER_PARAM SERIAL_8N1
 #endif
 
 #define dimPar MODBUS_DIMMER_PARAM