diff --git a/gradle.properties b/gradle.properties
index 3a84794a..a1fbf07d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.12.10
 
 # Mod Properties
-	mod_version = 3.1.1
+	mod_version = 3.1.2
 	maven_group = com.github.clevernucleus
 	archives_base_name = playerex
 
diff --git a/src/main/java/com/github/clevernucleus/playerex/client/gui/AttributesPageLayer.java b/src/main/java/com/github/clevernucleus/playerex/client/gui/AttributesPageLayer.java
index 2b14ac80..51b5fa2a 100644
--- a/src/main/java/com/github/clevernucleus/playerex/client/gui/AttributesPageLayer.java
+++ b/src/main/java/com/github/clevernucleus/playerex/client/gui/AttributesPageLayer.java
@@ -143,15 +143,17 @@ public void drawBackground(MatrixStack matrices, float delta, int mouseX, int mo
 			
 			DataAttributesAPI.ifPresent(player, attribute, (Object)null, value -> {
 				if(BUTTON_KEYS.contains(key)) {
+					double max = ((IEntityAttribute)attribute.get()).maxValue();
+					
 					if(key.equals(lvl)) {
-						button.active = (value < ((IEntityAttribute)attribute.get()).maxValue()) && (player.experienceLevel >= ExAPI.getConfig().requiredXp(player));
+						button.active = value < max && player.experienceLevel >= ExAPI.getConfig().requiredXp(player);
 					} else {
 						double modifierValue = this.playerData.get(attribute.get());
 						
 						if(this.canRefund()) {
 							button.active = modifierValue >= 1.0D;
 						} else {
-							button.active = this.playerData.skillPoints() >= 1;
+							button.active = modifierValue < max && this.playerData.skillPoints() >= 1;
 						}
 						
 						button.alt = this.canRefund();