diff --git a/src/fenrir-package/fenrir.py b/src/fenrir-package/fenrir.py
index 5fc0c090..85b07f96 100755
--- a/src/fenrir-package/fenrir.py
+++ b/src/fenrir-package/fenrir.py
@@ -53,7 +53,8 @@ class fenrir():
         if self.environment['runtime']['applicationManager'].isApplicationChange():
             self.environment['runtime']['commandManager'].executeDefaultTrigger('onApplicationChange')
             self.environment['runtime']['commandManager'].executeSwitchTrigger('onSwitchApplicationProfile', \
-              self.environment['screenData']['oldApplication'], self.environment['screenData']['newApplication'])            
+              self.environment['runtime']['applicationManager'].getPrevApplication(), \
+              self.environment['runtime']['applicationManager'].getCurrentApplication())            
         self.environment['runtime']['commandManager'].executeDefaultTrigger('onInput')
         if self.environment['runtime']['screenManager'].isScreenChange():    
             self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenUpdate')