diff --git a/Moose Development/Moose/Core/UserFlag.lua b/Moose Development/Moose/Core/UserFlag.lua
index 67c03a127..3c11718da 100644
--- a/Moose Development/Moose/Core/UserFlag.lua	
+++ b/Moose Development/Moose/Core/UserFlag.lua	
@@ -54,8 +54,10 @@ do -- UserFlag
   --   BlueVictory:Set( 100 ) -- Set the UserFlag VictoryBlue to 100.
   --   
   function USERFLAG:Set( Number ) --R2.3
+  
+    self:F( { Number = Number } )
     
-    trigger.misc.setUserFlag( self.UserFlagName )
+    trigger.action.setUserFlag( self.UserFlagName, Number )
     
     return self
   end  
@@ -68,7 +70,7 @@ do -- UserFlag
   --   local BlueVictory = USERFLAG:New( "VictoryBlue" )
   --   local BlueVictoryValue = BlueVictory:Get() -- Get the UserFlag VictoryBlue value.
   --   
-  function USERFLAG:Set( Number ) --R2.3
+  function USERFLAG:Get( Number ) --R2.3
     
     return trigger.misc.getUserFlag( self.UserFlagName )
   end  
diff --git a/Moose Development/Moose/Wrapper/Unit.lua b/Moose Development/Moose/Wrapper/Unit.lua
index ec976b0bc..237565886 100644
--- a/Moose Development/Moose/Wrapper/Unit.lua	
+++ b/Moose Development/Moose/Wrapper/Unit.lua	
@@ -168,7 +168,10 @@ function UNIT:Destroy()
   local DCSObject = self:GetDCSObject()
   
   if DCSObject then
-    USERFLAG:New( self:GetGroup():GetName() ):Set( 100 )
+    local UnitGroup = self:GetGroup()
+    local UnitGroupName = UnitGroup:GetName()
+    self:F( { UnitGroupName = UnitGroupName } )
+    USERFLAG:New( UnitGroupName ):Set( 100 )
     --BASE:CreateEventCrash( timer.getTime(), DCSObject )
     DCSObject:destroy()
   end