diff --git a/mods/mcl_boats/init.lua b/mods/mcl_boats/init.lua
index 1ef583a527..defc2d5e7b 100644
--- a/mods/mcl_boats/init.lua
+++ b/mods/mcl_boats/init.lua
@@ -60,16 +60,16 @@ function boat.on_punch(self, puncher, time_from_last_punch, tool_capabilities, d
 	 if self._driver then
 		self._driver:set_detach()
 		self._driver = nil
-		boat.schedule_removal(self)
 		if not minetest.setting_getbool("creative_mode") then
 			puncher:get_inventory():add_item("main", "mcl_boats:boat")
 		end
+		self.object:remove()
 	else
 
-		boat.schedule_removal(self)
 		if not minetest.setting_getbool("creative_mode") then
 			puncher:get_inventory():add_item("main", "mcl_boats:boat")
 		end
+		self.object:remove()
 	
 	end
 end
@@ -134,15 +134,6 @@ function boat.on_step(self, dtime)
 	
 end
 
-function boat.schedule_removal(self)
-
-	minetest.after(0.25,function()
-		self.object:remove()
-	end)
-
-end
-
-
 minetest.register_entity("mcl_boats:boat", boat)
 
 minetest.register_craftitem("mcl_boats:boat", {
diff --git a/mods/mcl_boats/models/mcl_boat_base.x b/mods/mcl_boats/models/mcl_boats_base.x
similarity index 100%
rename from mods/mcl_boats/models/mcl_boat_base.x
rename to mods/mcl_boats/models/mcl_boats_base.x