diff --git a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
index abbabee5d..37ed961a5 100644
--- a/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
+++ b/src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java
@@ -2098,24 +2098,14 @@ public void run() {
 
         for (int i = 0; i <= 7; i++) {
             ItemStack modifiedHatch = ItemList.Hatch_Output_ME.get(1L);
-            NBTTagCompound hatchNBT = modifiedHatch.getTagCompound();
-            if (hatchNBT != null) {
-                hatchNBT.setLong("baseCapacity", capacities[i]);
-            } else {
-                hatchNBT = new NBTTagCompound();
-                hatchNBT.setLong("baseCapacity", capacities[i] * 256);
-                modifiedHatch.setTagCompound(hatchNBT);
-            }
+            NBTTagCompound hatchNBT = new NBTTagCompound();
+            hatchNBT.setLong("baseCapacity", capacities[i] * 256);
+            modifiedHatch.setTagCompound(hatchNBT);
 
             ItemStack modifiedBus = ItemList.Hatch_Output_Bus_ME.get(1L);
-            NBTTagCompound busNBT = modifiedBus.getTagCompound();
-            if (busNBT != null) {
-                busNBT.setLong("baseCapacity", capacities[i]);
-            } else {
-                busNBT = new NBTTagCompound();
-                busNBT.setLong("baseCapacity", capacities[i]);
-                modifiedBus.setTagCompound(busNBT);
-            }
+            NBTTagCompound busNBT = new NBTTagCompound();
+            busNBT.setLong("baseCapacity", capacities[i]);
+            modifiedBus.setTagCompound(busNBT);
 
             GTModHandler.addShapelessCraftingRecipe(
                     modifiedHatch,
@@ -2124,6 +2114,27 @@ public void run() {
                     modifiedBus,
                     new Object[] { ItemList.Hatch_Output_Bus_ME.get(1L), itemComponents[i] });
         }
+        final ItemStack SINGULARITY = GTModHandler
+                .getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1);
+        final ItemStack FLUID_SINGULARITY = GTModHandler
+                .getModItem(AE2FluidCraft.ID, "fluid_storage.singularity", 1, 0);
+
+        ItemStack modifiedHatch = ItemList.Hatch_Output_ME.get(1L);
+        NBTTagCompound hatchNBT = new NBTTagCompound();
+        hatchNBT.setLong("baseCapacity", Long.MAX_VALUE);
+        modifiedHatch.setTagCompound(hatchNBT);
+
+        ItemStack modifiedBus = ItemList.Hatch_Output_Bus_ME.get(1L);
+        NBTTagCompound busNBT = new NBTTagCompound();
+        busNBT.setLong("baseCapacity", Long.MAX_VALUE);
+        modifiedBus.setTagCompound(busNBT);
+
+        GTModHandler.addShapelessCraftingRecipe(
+                modifiedBus,
+                new Object[] { ItemList.Hatch_Output_Bus_ME.get(1L), SINGULARITY });
+        GTModHandler.addShapelessCraftingRecipe(
+                modifiedHatch,
+                new Object[] { ItemList.Hatch_Output_ME.get(1L), FLUID_SINGULARITY });
 
         // Pre-add planet block to EOH controller
         for (String dimAbbreviation : DimensionHelper.DimNameDisplayed) {