diff --git a/TeslaLogger/DBHelper.cs b/TeslaLogger/DBHelper.cs
index 245e58aa..a18b61a4 100644
--- a/TeslaLogger/DBHelper.cs
+++ b/TeslaLogger/DBHelper.cs
@@ -3303,6 +3303,15 @@ public void StartChargingState(WebHelper wh)
                 Logfile.Log(ex.ToString());
             }
 
+            int posid = GetMaxPosid();
+
+            if (car.FleetAPI)
+            {
+                car.webhelper.IsCharging(); // insert a charging row in DB
+                UpdatePosFromCurrentJSON(posid);
+            }
+
+
             int chargeID = GetMaxChargeid(out DateTime chargeStart);
             long chargingstateid = 0;
             if (wh != null)
@@ -3341,7 +3350,7 @@ public void StartChargingState(WebHelper wh)
                     {
                         cmd.Parameters.AddWithValue("@CarID", wh.car.CarInDB);
                         cmd.Parameters.AddWithValue("@StartDate", chargeStart);
-                        cmd.Parameters.AddWithValue("@Pos", GetMaxPosid());
+                        cmd.Parameters.AddWithValue("@Pos", posid);
                         cmd.Parameters.AddWithValue("@StartChargingID", chargeID);
                         cmd.Parameters.AddWithValue("@fast_charger_brand", wh.fast_charger_brand);
                         cmd.Parameters.AddWithValue("@fast_charger_type", wh.fast_charger_type);
diff --git a/TeslaLogger/Properties/AssemblyInfo.cs b/TeslaLogger/Properties/AssemblyInfo.cs
index 7dde06fa..da63ebec 100644
--- a/TeslaLogger/Properties/AssemblyInfo.cs
+++ b/TeslaLogger/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.58.5.0")]
-[assembly: AssemblyFileVersion("1.58.5.0")]
+[assembly: AssemblyVersion("1.58.6.0")]
+[assembly: AssemblyFileVersion("1.58.6.0")]
 
 [assembly: InternalsVisibleTo("UnitTestsTeslalogger")]
diff --git a/TeslaLogger/bin/TeslaLogger.exe b/TeslaLogger/bin/TeslaLogger.exe
index ae99c1d1..260489eb 100644
Binary files a/TeslaLogger/bin/TeslaLogger.exe and b/TeslaLogger/bin/TeslaLogger.exe differ
diff --git a/TeslaLogger/bin/changelog.md b/TeslaLogger/bin/changelog.md
index bafa9257..9db172f1 100644
--- a/TeslaLogger/bin/changelog.md
+++ b/TeslaLogger/bin/changelog.md
@@ -1,4 +1,4 @@
-# Version 1.58.5
+# Version 1.58.6
 - Bugfixes
 
 # Version 1.58.2