diff --git a/lua/ulx/modules/sh/cfc_arrest.lua b/lua/ulx/modules/sh/cfc_arrest.lua
index acd8328a..14305c4b 100644
--- a/lua/ulx/modules/sh/cfc_arrest.lua
+++ b/lua/ulx/modules/sh/cfc_arrest.lua
@@ -3,6 +3,16 @@ local cmd = CFCUlxCommands.arrest
 
 CATEGORY_NAME = "Cleanup"
 
+local function isTargetPlayer( ply, targetPlayers )
+    for _, p in pairs( targetPlayers ) do
+        if p == ply then
+            return true
+        end
+    end
+
+    return false
+end
+
 function cmd.arrest( callingPlayer, targetPlayers )
     local entities = ents.GetAll()
     local entCount = 0
@@ -10,7 +20,7 @@ function cmd.arrest( callingPlayer, targetPlayers )
 
     for _, ent in ipairs( entities ) do
         local owner = ent.CPPIGetOwner and ent:CPPIGetOwner()
-        if owner and entCounts[owner] then
+        if owner and isTargetPlayer( owner ) then
             if ent:GetClass() == "gmod_wire_expression2" then
                 ent:PCallHook( "destruct" )
                 ent:ResetContext()
@@ -19,7 +29,7 @@ function cmd.arrest( callingPlayer, targetPlayers )
             end
 
             if ent:GetClass() == "starfall_processor" then
-                ent:Error( SF.MakeError( ent.name .. ": Halted by ULX", 1, true, true) )
+                ent:Error( SF.MakeError( ent.name .. ": Halted by ULX", 1, true, true ) )
             end
 
             local canFreeze = not ( ent:IsWeapon() or ent:GetUnFreezable() or ent:IsPlayer() )
diff --git a/lua/ulx/modules/sh/cfc_freeze.lua b/lua/ulx/modules/sh/cfc_freezeprops.lua
similarity index 100%
rename from lua/ulx/modules/sh/cfc_freeze.lua
rename to lua/ulx/modules/sh/cfc_freezeprops.lua