diff --git a/functions.lua b/functions.lua
index d6ed105..a06f34d 100644
--- a/functions.lua
+++ b/functions.lua
@@ -6,6 +6,25 @@ function boost_cart:get_sign(z)
 	end
 end
 
+function boost_cart:manage_attachment(player, status, obj)
+	if not player then
+		return
+	end
+	local player_name = player:get_player_name()
+	if default.player_attached[player_name] == status then
+		return
+	end
+	default.player_attached[player_name] = status
+
+	if status then
+		player:set_attach(obj, "", {x=0, y=6, z=0}, {x=0, y=0, z=0})
+		player:set_eye_offset({x=0, y=-4, z=0},{x=0, y=-4, z=0})
+	else
+		player:set_detach()
+		player:set_eye_offset({x=0, y=0, z=0},{x=0, y=0, z=0})
+	end
+end
+
 function boost_cart:velocity_to_dir(v)
 	if math.abs(v.x) > math.abs(v.z) then
 		return {x=boost_cart:get_sign(v.x), y=boost_cart:get_sign(v.y), z=0}
diff --git a/init.lua b/init.lua
index 05049ef..7840f10 100644
--- a/init.lua
+++ b/init.lua
@@ -55,11 +55,10 @@ function boost_cart.cart:on_rightclick(clicker)
 	local player_name = clicker:get_player_name()
 	if self.driver and player_name == self.driver then
 		self.driver = nil
-		clicker:set_detach()
+		boost_cart:manage_attachment(clicker, false)
 	elseif not self.driver then
 		self.driver = player_name
-		default.player_attached[player_name] = true
-		clicker:set_attach(self.object, "", {x=0, y=3, z=0}, {x=0, y=0, z=0})
+		boost_cart:manage_attachment(clicker, true, self.object)
 	end
 end
 
@@ -90,11 +89,8 @@ function boost_cart.cart:on_punch(puncher, time_from_last_punch, tool_capabiliti
 			if self.old_pos then
 				self.object:setpos(self.old_pos)
 			end
-			default.player_attached[self.driver] = nil
 			local player = minetest.get_player_by_name(self.driver)
-			if player then
-				player:set_detach()
-			end
+			boost_cart:manage_attachment(player, false)
 		end
 		for _,obj_ in ipairs(self.attached_items) do
 			if obj_ then