diff --git a/corpse_util.lua b/corpse_util.lua
index b79385f9..d52905af 100644
--- a/corpse_util.lua
+++ b/corpse_util.lua
@@ -1,13 +1,20 @@
 local Event = require 'utils.event'
+local Global = require 'utils.global'
 local Task = require 'utils.Task'
 local Token = require 'utils.global_token'
 
-local function on_init()
-    global.corpse_util_corpses = {}
-end
+local player_corpses = {}
+
+Global.register(
+    player_corpses,
+    function(tbl)
+        player_corpses = tbl
+    end
+)
 
 local function player_died(event)
-    local player = game.players[event.player_index]
+    local player_index = event.player_index
+    local player = game.players[player_index]
 
     if not player or not player.valid then
         return
@@ -16,12 +23,14 @@ local function player_died(event)
     local pos = player.position
     local entities =
         player.surface.find_entities_filtered {
-        area = {{pos.x, pos.y}, {pos.x + 1, pos.y + 1}},
+        area = {{pos.x - 0.5, pos.y - 0.5}, {pos.x + 0.5, pos.y + 0.5}},
         name = 'character-corpse'
     }
+
+    local tick = game.tick
     local entity
     for _, e in ipairs(entities) do
-        if e.character_corpse_player_index == event.player_index then
+        if e.character_corpse_player_index == event.player_index and e.character_corpse_tick_of_death == tick then
             entity = e
             break
         end
@@ -43,16 +52,14 @@ local function player_died(event)
         return
     end
 
-    global.corpse_util_corpses[position.x .. ',' .. position.y] = tag
+    player_corpses[player_index * 0x100000000 + tick] = tag
 end
 
-local function remove_tag(position)
-    local pos = position.x .. ',' .. position.y
+local function remove_tag(player_index, tick)
+    local index = player_index * 0x100000000 + tick
 
-    local tag = global.corpse_util_corpses[pos]
-    if tag then
-        global.corpse_util_corpses[pos] = nil
-    end
+    local tag = player_corpses[index]
+    player_corpses[index] = nil
 
     if not tag or not tag.valid then
         return
@@ -65,7 +72,7 @@ local function corpse_expired(event)
     local entity = event.corpse
 
     if entity and entity.valid then
-        remove_tag(entity.position)
+        remove_tag(entity.character_corpse_player_index, entity.character_corpse_tick_of_death)
     end
 end
 
@@ -73,7 +80,7 @@ local corpse_util_mined_entity =
     Token.register(
     function(data)
         if not data.entity.valid then
-            remove_tag(data.position)
+            remove_tag(data.player_index, data.tick)
         end
     end
 )
@@ -84,11 +91,18 @@ local function mined_entity(event)
     if entity and entity.valid and entity.name == 'character-corpse' then
         -- The corpse may be mined but not removed (if player doesn't have inventory space)
         -- so we wait one tick to see if the corpse is gone.
-        Task.set_timeout_in_ticks(1, corpse_util_mined_entity, {entity = entity, position = entity.position})
+        Task.set_timeout_in_ticks(
+            1,
+            corpse_util_mined_entity,
+            {
+                entity = entity,
+                player_index = entity.character_corpse_player_index,
+                tick = entity.character_corpse_tick_of_death
+            }
+        )
     end
 end
 
-Event.on_init(on_init)
 Event.add(defines.events.on_player_died, player_died)
 Event.add(defines.events.on_character_corpse_expired, corpse_expired)
 Event.add(defines.events.on_pre_player_mined_item, mined_entity)