diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpType.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpType.java
index ace874485c..3817bfae58 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpType.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCommon/defs/PumpType.java
@@ -4,6 +4,8 @@ package info.nightscout.androidaps.plugins.PumpCommon.defs;
 import java.util.HashMap;
 import java.util.Map;
 
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.PumpCommon.data.DoseSettings;
 
 
@@ -272,18 +274,21 @@ public enum PumpType {
     }
 
 
-    public String getFullDescription(String i18nTemplate) {
+    public String getFullDescription(String i18nTemplate, boolean hasExtendedBasals) {
 
         String unit = getPumpTempBasalType()==PumpTempBasalType.Percent ? "%" : "";
 
         DoseSettings eb = getExtendedBolusSettings();
         DoseSettings tbr = getTbrSettings();
 
+        String extendedNote = hasExtendedBasals ? MainApp.gs(R.string.virtualpump_pump_def_extended_note) : "";
+
         return String.format(i18nTemplate, //
                 getStep("" + getBolusSize(), getSpecialBolusSize()), //
                 eb.getStep(), eb.getDurationStep(), eb.getMaxDuration()/60, //
                 getStep(getBaseBasalRange(), getBaseBasalSpecialSteps()), //
-                tbr.getMinDose() + unit + "-" + tbr.getMaxDose() + unit, tbr.getStep() + unit,  tbr.getDurationStep(), tbr.getMaxDuration()/60);
+                tbr.getMinDose() + unit + "-" + tbr.getMaxDose() + unit, tbr.getStep() + unit,
+                tbr.getDurationStep(), tbr.getMaxDuration()/60, extendedNote);
     }
 
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java
index f01fb0f379..ef4c85e0a7 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpFragment.java
@@ -113,10 +113,8 @@ public class VirtualPumpFragment extends SubscriberFragment {
 
                     String template = MainApp.gs(R.string.virtualpump_pump_def);
 
-                    template = template.replace("EXTENDED_NOTE", pumpType.hasExtendedBasals() ? //
-                            MainApp.gs(R.string.virtualpump_pump_def_extended_note) : "");
 
-                    pumpSettingsView.setText(pumpType.getFullDescription(template));
+                    pumpSettingsView.setText(pumpType.getFullDescription(template, pumpType.hasExtendedBasals()));
 
                 }
             });