diff --git a/dbus-batrium-native/dbus-batrium-native.py b/dbus-batrium-native/dbus-batrium-native.py
index 6f8cdf6..6f687ee 100644
--- a/dbus-batrium-native/dbus-batrium-native.py
+++ b/dbus-batrium-native/dbus-batrium-native.py
@@ -267,18 +267,23 @@ class DbusBatteryService:
             self._dbusservice['/System/MaxVoltageCellId'] = self._bat.maxCellVoltageId
             self._dbusservice['/System/MinVoltageCellId'] = self._bat.minCellVoltageId
             
-            if self._bat.current > 0:
+            if self._bat.current > 1:
                 #charging
-                if self._bat.NumberInBypass < 80000:
+                if self._bat.TimeToFull < 432000:
                     self._dbusservice['/TimeToGo'] = self._bat.TimeToFull
                 else:
                     self._dbusservice['/TimeToGo'] = None
             else :
+                self._dbusservice['/TimeToGo'] = None
+                
+            if self._bat.current < -1:
                 #discharging
-                if self._bat.NumberInBypass < 80000:
+                if self._bat.TimeToEmpty < 432000:
                     self._dbusservice['/TimeToGo'] = self._bat.TimeToEmpty
                 else:
                     self._dbusservice['/TimeToGo'] = None
+            else :
+                self._dbusservice['/TimeToGo'] = None
 
             if self._bat.NumberInBypass == self._bat.numberOfModules:
                 self.cell_balanced = True