diff --git a/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java b/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
index 666b3191c6..dd00978d04 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/IobTotal.java
@@ -64,9 +64,9 @@ public class IobTotal {
         result.iob = bolusIOB.iob + basalIob.basaliob;
         result.activity = bolusIOB.activity + basalIob.activity;
         result.bolussnooze = bolusIOB.bolussnooze;
-        result.basaliob = basalIob.basaliob;
-        result.netbasalinsulin = basalIob.netbasalinsulin;
-        result.hightempinsulin = basalIob.hightempinsulin;
+        result.basaliob = bolusIOB.basaliob + basalIob.basaliob;
+        result.netbasalinsulin = bolusIOB.netbasalinsulin + basalIob.netbasalinsulin;
+        result.hightempinsulin = basalIob.hightempinsulin + bolusIOB.hightempinsulin;
         result.microBolusInsulin = bolusIOB.microBolusInsulin + basalIob.microBolusInsulin;
         result.microBolusIOB = bolusIOB.microBolusIOB + basalIob.microBolusIOB;
         result.lastBolusTime = bolusIOB.lastBolusTime;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
index 44330ac7e6..8a14bd5645 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
@@ -202,8 +202,11 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
             } else {
                 if (t.date > total.lastBolusTime)
                     total.lastBolusTime = t.date;
-                total.basaliob += t.insulin;
+                total.basaliob += tIOB.iobContrib;
                 total.microBolusIOB += tIOB.iobContrib;
+                total.hightempinsulin += t.insulin;
+                total.netbasalinsulin += t.insulin;
+                total.microBolusInsulin += t.insulin;
             }
         }