diff --git a/src/main/java/com/hbm/blocks/machine/BlockCargoElevator.java b/src/main/java/com/hbm/blocks/machine/BlockCargoElevator.java
index 74ff525f9..25c89c85d 100644
--- a/src/main/java/com/hbm/blocks/machine/BlockCargoElevator.java
+++ b/src/main/java/com/hbm/blocks/machine/BlockCargoElevator.java
@@ -52,6 +52,10 @@ public class BlockCargoElevator extends BlockDummyable {
 		int[] pos = ((BlockDummyable) ModBlocks.cargo_elevator).findCore(world, x, y, z);
 		if(pos != null) {
 			TileEntityCargoElevator elevator = (TileEntityCargoElevator) world.getTileEntity(pos[0], pos[1], pos[2]);
+
+			x = pos[0];
+			y = pos[1];
+			z = pos[2];
 			
 			// due to the collisions being really fucking weird, we have to add custom elevator extension too
 			if(player.getHeldItem() != null && player.getHeldItem().getItem() == Item.getItemFromBlock(this)) {
@@ -71,9 +75,9 @@ public class BlockCargoElevator extends BlockDummyable {
 					elevator.markDirty();
 					if(!player.capabilities.isCreativeMode) player.getHeldItem().stackSize--;
 				}
+			} else {
+				elevator.toggleElevator();
 			}
-			
-			elevator.toggleElevator();
 		}
 		return true;
 	}
diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java
index 3ccde0b5f..e10f81ae9 100644
--- a/src/main/java/com/hbm/main/CraftingManager.java
+++ b/src/main/java/com/hbm/main/CraftingManager.java
@@ -647,6 +647,8 @@ public class CraftingManager {
 		addRecipeAuto(new ItemStack(ModBlocks.pink_slab, 6), new Object[] { "WWW", 'W', ModBlocks.pink_planks });
 		addRecipeAuto(new ItemStack(ModBlocks.pink_stairs, 6), new Object[] { "W  ", "WW ", "WWW", 'W', ModBlocks.pink_planks });
 
+		addRecipeAuto(new ItemStack(ModBlocks.cargo_elevator, 3), new Object[] { "GGG", "SPS", 'G', ModBlocks.steel_grate, 'S', STEEL.ingot(), 'P', new ItemStack(ModItems.part_generic, 1, EnumPartType.PISTON_HYDRAULIC.ordinal()) });
+		
 		addRecipeAuto(new ItemStack(ModItems.door_metal, 1), new Object[] { "II", "SS", "II", 'I', IRON.plate(), 'S', STEEL.plate() });
 		addRecipeAuto(new ItemStack(ModItems.door_office, 1), new Object[] { "II", "SS", "II", 'I', KEY_PLANKS, 'S', IRON.plate() });
 		addRecipeAuto(new ItemStack(ModItems.door_bunker, 1), new Object[] { "II", "SS", "II", 'I', STEEL.plate(), 'S', PB.plate() });
diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang
index 351be16c2..68591356e 100644
--- a/src/main/resources/assets/hbm/lang/de_DE.lang
+++ b/src/main/resources/assets/hbm/lang/de_DE.lang
@@ -3997,6 +3997,7 @@ tile.capacitor_niobium.name=Niobkondensator (LEGACY)
 tile.capacitor_schrabidate.name=Schrabidatkondensator (LEGACY)
 tile.capacitor_tantalium.name=Tantalkondensator (LEGACY)
 tile.capacitor.desc=Input: Oben$Output: Unten, über Kondensator-Bus
+tile.cargo_elevator.name=Frachtenaufzug
 tile.charge_c4.name=Abrissladung
 tile.charge_dynamite.name=Zeitbombe
 tile.charge_miner.name=Bergbauladung mit Zeitzünder
diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang
index 408604858..e531cc305 100644
--- a/src/main/resources/assets/hbm/lang/en_US.lang
+++ b/src/main/resources/assets/hbm/lang/en_US.lang
@@ -5196,6 +5196,7 @@ tile.capacitor_niobium.name=Niobium Capacitor (LEGACY)
 tile.capacitor_schrabidate.name=Schrabidate Capacitor (LEGACY)
 tile.capacitor_tantalium.name=Tantalum Capacitor (LEGACY)
 tile.capacitor.desc=Input: Top$Output: Bottom, via Capacitor Bus
+tile.cargo_elevator.name=Cargo Elevator
 tile.charge_c4.name=Demolition Charge
 tile.charge_dynamite.name=Time Bomb
 tile.charge_miner.name=Timed Mining Charge