diff --git a/tubelib/tubes2.lua b/tubelib/tubes2.lua
index fda4ae1..e427995 100644
--- a/tubelib/tubes2.lua
+++ b/tubelib/tubes2.lua
@@ -62,12 +62,11 @@ function tubelib.get_neighbor_pos(pos, side)
 		dir = ((facedir + node.param2) % 4) + 1
 	end
 	local npos, ndir = tubelib.get_next_tube(pos, dir)
-	if ndir == nil then
-		return pos, SideToFacedir[side]
-	end
 	local node = minetest.get_node(npos)
 	if tubelib.TubeNames[node.name] then
-		npos, ndir = remote_node(npos, ndir)
+		if ndir then
+			npos, ndir = remote_node(npos, ndir)
+		end
 		return npos, dir-1
 	end
 	return npos, facedir