diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
index d14abd580f..eb2ed05798 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
@@ -487,8 +487,7 @@ public class ComboPlugin implements PluginBase, PumpInterface {
             percent = rounded;
         }
 
-        //FIXME maybe needs a flag in pump config?
-        percent = percent > 500 ? 500 : percent;
+        percent = percent > pumpDescription.maxTempPercent ? pumpDescription.maxTempPercent : percent;
 
         CommandResult commandResult = runCommand(new SetTbrCommand(percent, durationInMinutes));
         if (commandResult.enacted) {