diff --git a/mcl-barrels.lua b/mcl-barrels.lua
index c18c44d..d2e17f0 100644
--- a/mcl-barrels.lua
+++ b/mcl-barrels.lua
@@ -5,17 +5,23 @@
 local tube_entry = "^pipeworks_tube_connection_wooden.png"
 
 -- Original Definitions
-local old_barrel_closed_def = table.copy(minetest.registered_items["mcl_barrels:barrel_closed"])
+local old_barrel = table.copy(minetest.registered_items["mcl_barrels:barrel_closed"])
 local old_barrel_open_def = table.copy(minetest.registered_items["mcl_barrels:barrel_open"])
 
+local groups = old_barrel.groups
+groups["tubedevice"] = 1
+groups["tubedevice_receiver"] = 1
+local groups_open = table.copy(groups)
+groups_open["not_in_creative_inventory"] = 1
+
 
 -- Override Construction
-local override_mcl_barrel_closed = {
+local override_barrel = {
    tiles = {"mcl_barrels_barrel_top.png^[transformR270",
 	    "mcl_barrels_barrel_bottom.png"..tube_entry,
 	    "mcl_barrels_barrel_side.png"..tube_entry},
    after_place_node = function(pos, placer, itemstack, pointed_thing)
-      old_barrel_closed_def.after_place_node(pos, placer, itemstack, pointed_thing)
+      old_barrel.after_place_node(pos, placer, itemstack, pointed_thing)
       pipeworks.after_place(pos, placer, itemstack, pointed_thing)
    end,
    tube = {
@@ -36,28 +42,24 @@ local override_mcl_barrel_closed = {
       connect_sides = {left = 1, right = 1, back = 1, front = 1, bottom = 1}
    },
    after_dig_node = function(pos)
-      old_barrel_closed_def.after_dig_node(pos)
+      old_barrel.after_dig_node(pos)
       pipeworks.after_dig(pos)
    end,
-   groups = table.copy(old_barrel_closed_def.groups),
-   --on_rotate = pipeworks.on_rotate
+   groups = table.copy(old_barrel.groups),
+   on_rotate = pipeworks.on_rotate
 }
 
-override_mcl_barrel_open = table.copy(override_mcl_barrel_closed)
+override_barrel_open = table.copy(override_barrel)
 
-override_mcl_barrel_open.tiles = {
+override_barrel_open.tiles = {
    "mcl_barrels_barrel_top_open.png",
    "mcl_barrels_barrel_bottom.png"..tube_entry,
    "mcl_barrels_barrel_side.png"..tube_entry
 }
 
+override_barrel_open.groups = groups_open
 
--- Add the extra groups
-for _,v in ipairs({override_mcl_barrel_closed, override_mcl_barrel_open}) do
-   v.groups.tubedevice = 1
-   v.groups.tubedevice_receiver = 1
-end
 
 -- Override with the new modifications.
-minetest.override_item("mcl_barrels:barrel_closed", override_mcl_barrel_closed)
-minetest.override_item("mcl_barrels:barrel_open", override_mcl_barrel_open)
+minetest.override_item("mcl_barrels:barrel_closed", override_barrel)
+minetest.override_item("mcl_barrels:barrel_open", override_barrel_open)