diff --git a/Embedded/Moose_Embedded.lua b/Embedded/Moose_Embedded.lua
index d53726370..93a3994b7 100644
--- a/Embedded/Moose_Embedded.lua
+++ b/Embedded/Moose_Embedded.lua
@@ -7533,11 +7533,12 @@ end
 -- @param #CLIENT self
 -- @param #function CallBack Function.
 -- @return #CLIENT
-function CLIENT:Alive( CallBack )
+function CLIENT:Alive( CallBack, ... )
   self:F()
   
   self.ClientAlive2 = false
   self.ClientCallBack = CallBack
+  self.ClientParameters = arg
   self.AliveCheckScheduler = routines.scheduleFunction( self._AliveCheckScheduler, { self }, timer.getTime() + 1, 5 )
 
   return self
@@ -7592,7 +7593,7 @@ function CLIENT:_AliveCheckScheduler()
   if self:IsAlive() then
     if self.ClientAlive2 == false then
       self:T("Calling Callback function")
-      self.ClientCallBack( self )
+      self.ClientCallBack( self, unpack( self.ClientParameters ) )
       self.ClientAlive2 = true
     end
   else
diff --git a/Moose/Client.lua b/Moose/Client.lua
index 45c270ae4..5cb17fba3 100644
--- a/Moose/Client.lua
+++ b/Moose/Client.lua
@@ -91,11 +91,12 @@ end
 -- @param #CLIENT self
 -- @param #function CallBack Function.
 -- @return #CLIENT
-function CLIENT:Alive( CallBack )
+function CLIENT:Alive( CallBack, ... )
   self:F()
   
   self.ClientAlive2 = false
   self.ClientCallBack = CallBack
+  self.ClientParameters = arg
   self.AliveCheckScheduler = routines.scheduleFunction( self._AliveCheckScheduler, { self }, timer.getTime() + 1, 5 )
 
   return self
@@ -150,7 +151,7 @@ function CLIENT:_AliveCheckScheduler()
   if self:IsAlive() then
     if self.ClientAlive2 == false then
       self:T("Calling Callback function")
-      self.ClientCallBack( self )
+      self.ClientCallBack( self, unpack( self.ClientParameters ) )
       self.ClientAlive2 = true
     end
   else