diff --git a/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java b/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java
index 71c3e68..1258d07 100644
--- a/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java
+++ b/src/main/java/net/aboodyy/progressexpansion/ProgressExpansion.java
@@ -30,6 +30,7 @@
 import java.text.DecimalFormat;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 @SuppressWarnings("unused")
 public class ProgressExpansion extends PlaceholderExpansion implements Configurable {
@@ -160,8 +161,13 @@ public String onRequest(OfflinePlayer player, String identifier) {
             StringBuilder bar = new StringBuilder();
             amtPerSymbol = max / length;
             progress = (int) Math.floor(placeholder / amtPerSymbol);
-            if (placeholder >= max)
-                return full;
+            progress = Math.min(progress, length);
+            
+            if (placeholder >= max) {
+                if (!Objects.equals(full, "none")) {
+                    return full;
+                }
+            }
             while (barLength < progress) {
                 bar.append(completed);
                 barLength++;
@@ -208,4 +214,4 @@ private String replaceNumbers(String number) {
 
         return number;
     }
-}
\ No newline at end of file
+}