diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/create_cart.mcfunction b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/create_cart.mcfunction
index 0b9982ef98..e987fae575 100644
--- a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/create_cart.mcfunction
+++ b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/create_cart.mcfunction
@@ -6,7 +6,7 @@
 scoreboard players set $placed_block gm4_machine_data 1
 
 # summon new command block minecart
-summon command_block_minecart ~ ~ ~ {Command:"execute if score @s gm4_lt_value matches 1.. run function gm4_liquid_minecarts:drain_minecart",CustomName:{"text":"Liquid Minecart","italic":false},Tags:["gm4_liquid_minecart","gm4_liquid_minecart_empty","gm4_machine_cart","gm4_new_machine"],DisplayState:{"Name":"minecraft:hopper"},Passengers:[{id:"minecraft:armor_stand",Tags:["gm4_no_edit","gm4_liquid_minecart_stand","gm4_machine_cart","smithed.entity","smithed.strict","gm4_new_machine"],Invisible:1b,DisabledSlots:2039583,Small:1b,equipment:{feet:{id:"minecraft:stick",count:1,components:{"minecraft:custom_data":{gm4_liquid_minecarts:{liquid_tag:"null"}}}}},Pose:{Head:[180.0f,0.0f,0.0f],RightArm:[0.0f,-90.0f,0.0f]}}]}
+summon command_block_minecart ~ ~ ~ {Command:"execute if score @s gm4_lt_value matches 1.. run function gm4_liquid_minecarts:drain_minecart",CustomName:{"text":"Liquid Minecart","italic":false},Tags:["gm4_liquid_minecart","gm4_liquid_minecart_empty","gm4_machine_cart","gm4_new_machine"],DisplayState:{"Name":"minecraft:hopper"},Passengers:[{id:"minecraft:marker",Tags:["gm4_liquid_minecart_marker","gm4_machine_cart","smithed.entity","smithed.strict","gm4_new_machine"]},{id:"minecraft:armor_stand",Tags:["gm4_no_edit","gm4_liquid_minecart_stand","gm4_machine_cart","smithed.entity","smithed.strict","gm4_new_machine"],Invisible:1b,DisabledSlots:2039583,Small:1b,equipment:{feet:{id:"minecraft:stick",count:1,components:{"minecraft:custom_data":{gm4_liquid_minecarts:{liquid_tag:"null"}}}}},Pose:{Head:[180.0f,0.0f,0.0f],RightArm:[0.0f,-90.0f,0.0f]}}]}
 tp @e[type=command_block_minecart,distance=..0.1,tag=gm4_new_machine] @s
 scoreboard players set @e[distance=..2,tag=gm4_new_machine] gm4_entity_version 1
 execute as @e[type=command_block_minecart,distance=..0.1,tag=gm4_new_machine,limit=1] run function gm4_liquid_minecarts:liquid_value_update
diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/destroy_cart.mcfunction b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/destroy_cart.mcfunction
index 706922f8b2..3b6b4ddaf4 100644
--- a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/destroy_cart.mcfunction
+++ b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/destroy_cart.mcfunction
@@ -7,6 +7,9 @@
 scoreboard players set $dropped_item gm4_machine_data 0
 execute as @e[type=item,distance=..3,nbt={Age:0s,Item:{id:"minecraft:minecart",count:1,components:{"minecraft:custom_name":{"italic":false,"text":"Liquid Minecart"}}}},limit=1,sort=nearest] at @s run function gm4_liquid_minecarts:machine/destroy_cart/drop_item
 
+# remove the armor stand
+kill @n[type=armor_stand,distance=..3,limit=1,tag=gm4_liquid_minecart_stand]
+
 # scan hoppers if no item was broken
 execute if score $dropped_item gm4_machine_data matches 0 run function gm4_liquid_minecarts:machine/destroy_cart/scan_hoppers
 
diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/destroy_cart/drop_item.mcfunction b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/destroy_cart/drop_item.mcfunction
index 85a915723a..6fe4ca5367 100644
--- a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/destroy_cart/drop_item.mcfunction
+++ b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/destroy_cart/drop_item.mcfunction
@@ -8,4 +8,3 @@ execute store success score $dropped_item gm4_machine_data run loot spawn ~ ~ ~
 
 # kill original (invalid) item
 kill @s
-
diff --git a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/verify_destroy_cart.mcfunction b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/verify_destroy_cart.mcfunction
index d55b538201..20f88390a2 100644
--- a/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/verify_destroy_cart.mcfunction
+++ b/gm4_liquid_minecarts/data/gm4_liquid_minecarts/function/machine/verify_destroy_cart.mcfunction
@@ -3,4 +3,4 @@
 # located at @s
 # run from #gm4_machines:destroy
 
-execute if entity @s[tag=gm4_liquid_minecart_stand] run function gm4_liquid_minecarts:machine/destroy_cart
+execute if entity @s[tag=gm4_liquid_minecart_marker] run function gm4_liquid_minecarts:machine/destroy_cart