diff --git a/src/main/java/com/gmail/nossr50/util/PotionUtil.java b/src/main/java/com/gmail/nossr50/util/PotionUtil.java
index b369250fe..96809637c 100644
--- a/src/main/java/com/gmail/nossr50/util/PotionUtil.java
+++ b/src/main/java/com/gmail/nossr50/util/PotionUtil.java
@@ -79,8 +79,8 @@ public class PotionUtil {
             String updatedName = convertLegacyNames(partialName).toUpperCase();
             return Arrays.stream(PotionType.values())
                     .filter(potionType -> getKeyGetKey(potionType).toUpperCase().contains(updatedName))
-                    .filter(potionType -> !isUpgraded || potionType.name().toUpperCase().contains(STRONG))
-                    .filter(potionType -> !isExtended || potionType.name().toUpperCase().contains(LONG))
+                    .filter(potionType -> isUpgraded == potionType.name().toUpperCase().startsWith(STRONG + "_"))
+                    .filter(potionType -> isExtended == potionType.name().toUpperCase().startsWith(LONG + "_"))
                     .findAny().orElse(null);
         }
     }