diff --git a/src/main/java/com/glodblock/github/common/storage/CellType.java b/src/main/java/com/glodblock/github/common/storage/CellType.java
index 871aeb256..f08227a37 100644
--- a/src/main/java/com/glodblock/github/common/storage/CellType.java
+++ b/src/main/java/com/glodblock/github/common/storage/CellType.java
@@ -19,6 +19,8 @@ public enum CellType {
     Cell4096kPart(6, AEFeature.StorageCells),
     Cell16384kPart(7, AEFeature.StorageCells);
 
+    public static final CellType[] VALUES = values();
+
     private final EnumSet<AEFeature> features;
     private int damageValue;
     private Item itemInstance;
@@ -53,7 +55,7 @@ public void setItemInstance(final Item itemInstance) {
     }
 
     public static EnumChatFormatting getTypeColor(int type) {
-        return getTypeColor(CellType.values()[type % CellType.values().length]);
+        return getTypeColor(CellType.VALUES[type % CellType.VALUES.length]);
     }
 
     public static EnumChatFormatting getTypeColor(CellType type) {