diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm
index 449098c607f..de413f7685d 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -41,11 +41,11 @@
 			M.facing_dir = null
 			M.update_canmove()
 		else
-			MA.anchored = TRUE	
+			MA.anchored = TRUE
 	else
 		return 0
 	post_buckle(MA)
-	MA.layer = src.layer + 1
+	MA.layer = src.layer + 0.1
 	return 1
 
 /obj/proc/unbuckle()
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index 3d03b4ad094..2a29f4a50a1 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -13,7 +13,6 @@
 	animate_movement=1
 	light_range = 3
 
-	can_buckle = 1
 	buckle_movable = 1
 	buckle_lying = 0
 
@@ -47,6 +46,10 @@
 	..()
 	//spawn the cell you want in each vehicle
 
+/obj/vehicle/Initialize()
+	. = ..()
+	LAZYADD(can_buckle, /mob/living)
+
 /obj/vehicle/Move()
 	if(world.time > l_move_time + move_delay)
 		var/old_loc = get_turf(src)
@@ -75,6 +78,9 @@
 	else
 		return 0
 
+/obj/vehicle/proc/create_vehicle_overlay()
+	return
+
 /obj/vehicle/attackby(obj/item/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/device/hand_labeler))
 		return
@@ -296,7 +302,6 @@
 			C.pixel_y += mob_offset_y
 		else
 			C.pixel_y += load_offset_y
-		C.layer = layer + 0.1		//so it sits above the vehicle
 
 	if(ismob(C))
 		buckle(C)
diff --git a/html/changelogs/alberyk-fixbuckling.yml b/html/changelogs/alberyk-fixbuckling.yml
new file mode 100644
index 00000000000..3538fe550c3
--- /dev/null
+++ b/html/changelogs/alberyk-fixbuckling.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed vehicles not working properly."