diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb68289f4..5d19981032 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/info/nightscout/androidaps/data/MealData.java b/app/src/main/java/info/nightscout/androidaps/data/MealData.java
index 277a5434a7..dc24599d9a 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/MealData.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/MealData.java
@@ -6,8 +6,10 @@ import java.util.List;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.db.BgReading;
 import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.plugins.OpenAPSAMA.Autosens;
 import info.nightscout.androidaps.plugins.OpenAPSAMA.AutosensResult;
+import info.nightscout.androidaps.plugins.OpenAPSAMA.OpenAPSAMAPlugin;
 import info.nightscout.client.data.NSProfile;
 
 /**
@@ -32,10 +34,12 @@ public class MealData {
         if (t > dia_ago && t <= now) {
             if (treatment.carbs >= 1) {
                 carbs += treatment.carbs;
-                AutosensResult result = Autosens.detectSensitivityandCarbAbsorption(bgReadings, t);
-                double myCarbsAbsorbed = result.carbsAbsorbed;
-                double myMealCOB = Math.max(0, carbs - myCarbsAbsorbed);
-                mealCOB = Math.max(mealCOB, myMealCOB);
+                if (MainApp.getSpecificPlugin(OpenAPSAMAPlugin.class).isEnabled(PluginBase.APS)) {
+                    AutosensResult result = Autosens.detectSensitivityandCarbAbsorption(bgReadings, t);
+                    double myCarbsAbsorbed = result.carbsAbsorbed;
+                    double myMealCOB = Math.max(0, carbs - myCarbsAbsorbed);
+                    mealCOB = Math.max(mealCOB, myMealCOB);
+                }
             }
             if (treatment.insulin > 0 && treatment.mealBolus) {
                 boluses += treatment.insulin;