diff --git a/src/config.cpp b/src/config.cpp
index 927f810..54566fa 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -32,8 +32,11 @@ Config myConfig;
 //
 Config::Config() {
     // Assiging default values
-    sprintf(&id[0], "%6x", (unsigned int) ESP.getChipId() );
-    sprintf(&mDNS[0], "" WIFI_MDNS "%s", getID() );
+    char buf[20];
+    sprintf(&buf[0], "%6x", (unsigned int) ESP.getChipId() );
+    id = &buf[0];
+    sprintf(&buf[0], "" WIFI_MDNS "%s", getID() );
+    mDNS = &buf[0];
     setTempFormat('C');
     setPushInterval(900);             // 15 minutes
     setVoltageFactor(1.59);           // Conversion factor for battery
diff --git a/src/main.cpp b/src/main.cpp
index 28819a6..fd583bb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -80,7 +80,7 @@ void checkSleepMode( float angle, float volt ) {
     }
 
     // Will not enter sleep mode if: charger is connected 
-    sleepModeActive = volt<4.15 ? true : false; 
+    sleepModeActive = (volt<4.15 && angle>85) || (volt>4.15) ? false : true; 
 
     // sleep mode active when flat
     //sleepModeActive = ( angle<85 && angle>5 ) ? true : false;