diff --git a/src/main/java/evilcraft/block/DarkTank.java b/src/main/java/evilcraft/block/DarkTank.java
index 9f61f201af..d0b1047399 100644
--- a/src/main/java/evilcraft/block/DarkTank.java
+++ b/src/main/java/evilcraft/block/DarkTank.java
@@ -256,7 +256,7 @@ public void getSubBlocks(Item item, CreativeTabs creativeTabs, List list) {
         		list.add(itemStackFilled);
         	}
         	capacity = capacity << 2;
-        } while(capacity < DarkTankConfig.maxTankSize);
+        } while(capacity << 2 < DarkTankConfig.maxTankSize);
     }
 
 }
diff --git a/src/main/java/evilcraft/block/DarkTankConfig.java b/src/main/java/evilcraft/block/DarkTankConfig.java
index 07e8081902..31bfd8890d 100644
--- a/src/main/java/evilcraft/block/DarkTankConfig.java
+++ b/src/main/java/evilcraft/block/DarkTankConfig.java
@@ -29,7 +29,12 @@ public class DarkTankConfig extends BlockContainerConfig {
 	 * The maximum tank size possible by combining tanks.
 	 */
 	@ConfigurableProperty(category = ConfigurableTypeCategory.MACHINE, comment = "The maximum tank size possible by combining tanks. (Make sure that you do not cross the max int size.)")
-	public static int maxTankSize = 4096000;
+	public static int maxTankSize = 65536000;
+	/**
+	 * The maximum tank size visible in the creative tabs.
+	 */
+	@ConfigurableProperty(category = ConfigurableTypeCategory.MACHINE, comment = "The maximum tank size visible in the creative tabs. (Make sure that you do not cross the max int size.)")
+	public static int maxTankCreativeSize = 4096000;
 
     /**
      * Make a new instance.