diff --git a/build.gradle b/build.gradle
index 5548b69..fb65450 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 apply plugin: 'org.spongepowered.mixin'
 
-version = '1.16.5-0.1.57-B' + getVersionNumber()
+version = '1.16.5-0.1.58-B' + getVersionNumber()
 group = 'com.ticticboooom.mods.mm' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'MasterfulMachinery'
 java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8.
diff --git a/src/main/java/com/ticticboooom/mods/mm/client/jei/category/MachineStructureRecipeCategory.java b/src/main/java/com/ticticboooom/mods/mm/client/jei/category/MachineStructureRecipeCategory.java
index ffecccf..c45086a 100644
--- a/src/main/java/com/ticticboooom/mods/mm/client/jei/category/MachineStructureRecipeCategory.java
+++ b/src/main/java/com/ticticboooom/mods/mm/client/jei/category/MachineStructureRecipeCategory.java
@@ -186,7 +186,10 @@ public class MachineStructureRecipeCategory implements IRecipeCategory<MachineSt
             double relMoveY = mouseY - yLastMousePosition;
             prePos.add((float)relMoveX * 0.08f, (float)-relMoveY * 0.08f, 0);
         }
-        Vector3f offset = new Vector3f(-minX - 0.5f - centreX, -minY - 0.5f - centerY, minZ - 0.5f + centreZ);
+
+        Vector3f offset = new Vector3f(minX, -minY, minZ); // Align bottom back left corner block to be at the center
+        offset.add(centreX, -centerY, centreZ); // Center on structure
+        offset.add(-0.5f, -0.5f, -0.5f); // Center on block
 
         Vector4f zero = new Vector4f(0, 0, 0, 1);
         zero.transform(matrixStack.getLast().getMatrix().copy());
diff --git a/src/test/resources/data/mm/recipes/structures/botanist_furnace.json b/src/test/resources/data/mm/recipes/structures/botanist_furnace.json
index 91ae518..5095b20 100644
--- a/src/test/resources/data/mm/recipes/structures/botanist_furnace.json
+++ b/src/test/resources/data/mm/recipes/structures/botanist_furnace.json
@@ -13,8 +13,8 @@
     [
       "-----",
       ".///0",
-      "1   1",
-      "2333C"
+      "1  C1",
+      "2333)"
     ],
     [
       "4---4",
diff --git a/src/test/resources/data/mm/recipes/structures/botanist_furnace_2.json b/src/test/resources/data/mm/recipes/structures/botanist_furnace_2.json
new file mode 100644
index 0000000..19828ee
--- /dev/null
+++ b/src/test/resources/data/mm/recipes/structures/botanist_furnace_2.json
@@ -0,0 +1,82 @@
+{
+  "type": "masterfulmachinery:machine_structure",
+  "id": "botanist_furnace_structure_2",
+  "controllerId": "botanist_furnace",
+  "name": "Botanist's Furnace 2",
+  "layout": [
+    [
+      ")))))",
+      ")***)",
+      "+++++",
+      ",))))"
+    ],
+    [
+      "-----",
+      ".///0",
+      "1   1",
+      "2333C"
+    ],
+    [
+      "4---4",
+      "5   5",
+      "1   1",
+      "13331"
+    ],
+    [
+      " 4-4 ",
+      " 676 ",
+      " 181 ",
+      " 111 "
+    ]
+  ],
+  "legend": {
+    ")": {
+      "block": "botania:livingrock"
+    },
+    "*": {
+      "block": "minecraft:redstone_block"
+    },
+    "+": {
+      "block": "create:belt"
+    },
+    ",": {
+      "block": "create:gearbox"
+    },
+    "-": {
+      "block": "minecraft:cobblestone"
+    },
+    ".": {
+      "block": "masterfulmachinery:botanist_furnace_botanist_furnace_item_port_items_input"
+    },
+    "/": {
+      "block": "minecraft:campfire"
+    },
+    "0": {
+      "block": "masterfulmachinery:botanist_furnace_botanist_furnace_item_port_items_output"
+    },
+    "1": {
+      "block": "botania:livingrock_stairs"
+    },
+    "2": {
+      "block": "masterfulmachinery:botanist_furnace_botanist_furnace_rotation_port_create_rotation_input"
+    },
+    "3": {
+      "block": "create:framed_glass"
+    },
+    "4": {
+      "block": "minecraft:cobblestone"
+    },
+    "5": {
+      "block": "minecraft:jack_o_lantern"
+    },
+    "6": {
+      "block": "minecraft:cobblestone"
+    },
+    "7": {
+      "block": "botania:mana_spreader"
+    },
+    "8": {
+      "block": "masterfulmachinery:botanist_furnace_botanist_furnace_mana_port_botania_mana_input"
+    }
+  }
+}
\ No newline at end of file
diff --git a/version.properties b/version.properties
index edba4fb..80b9077 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
-#Fri Oct 29 13:28:32 BST 2021
-VERSION_CODE=858
+#Sun Nov 28 15:53:16 GMT 2021
+VERSION_CODE=865