diff --git a/init.lua b/init.lua
index d943424..7136d4b 100644
--- a/init.lua
+++ b/init.lua
@@ -14,6 +14,7 @@
 
 minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")
 local DEBUG = false
+local CYCLIC = true
 
 pipeworks_liquid_texture = "default_water.png"
 
diff --git a/item_transport.lua b/item_transport.lua
index 12a177c..b733d32 100644
--- a/item_transport.lua
+++ b/item_transport.lua
@@ -465,7 +465,9 @@ function go_next(pos,velocity,stack)
 					break
 				end
 			until false
-			meta:set_int("tubedir",n)
+			if CYCLIC then
+				meta:set_int("tubedir",n)
+			end
 			velocity.x=tubes[n].vect.x*vel.speed
 			velocity.y=tubes[n].vect.y*vel.speed
 			velocity.z=tubes[n].vect.z*vel.speed
@@ -484,6 +486,9 @@ function go_next(pos,velocity,stack)
 				break
 			end
 		until false
+		if CYCLIC then
+			meta:set_int("tubedir",n)
+		end
 		velocity.x=chests[n].vect.x*speed
 		velocity.y=chests[n].vect.y*speed
 		velocity.z=chests[n].vect.z*speed