diff --git a/IcarusAndroid/app/src/main/java/framework/everywaretechnologies/it/icarusandroid/MainActivity.java b/IcarusAndroid/app/src/main/java/framework/everywaretechnologies/it/icarusandroid/MainActivity.java
index ed5d14de47aa20685df8b3b1307c59514f5bd67d..f2c4d0626e7d535cbdd34dc2ce44569a98a0d2fd 100644
--- a/IcarusAndroid/app/src/main/java/framework/everywaretechnologies/it/icarusandroid/MainActivity.java
+++ b/IcarusAndroid/app/src/main/java/framework/everywaretechnologies/it/icarusandroid/MainActivity.java
@@ -77,7 +77,7 @@ public class MainActivity extends AppCompatActivity {
         else
             eventType=enteredExitedScreenTrackSwitch.getTextOff().toString();
 
-        instance.trackScreen(MainActivity.this,eventType,true);
+        instance.trackScreen(eventType,true);
     }
 
     public void onBtnUserPrefChanges(View view){
diff --git a/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/Icarus.java b/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/Icarus.java
index 64867546faa45fbdca5f86b654df171beb082392..86cd41fcc55e3ba4d307aea6d5d74a7d5f80a3f1 100644
--- a/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/Icarus.java
+++ b/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/Icarus.java
@@ -112,11 +112,11 @@ public class Icarus {
     //---------------------- LOG SCREEN TRACKING ------------------------------
 
 
-    public void trackScreen(Context c,String screenEventType,boolean debug){
+    public void trackScreen(String screenEventType,boolean debug){
 
         Log.d(curContext.getString(R.string.icarus_class),"log screen track");
 
-        String screenName=c.getClass().getSimpleName();
+        String screenName=curContext.getClass().getSimpleName();
 
         if(screenEventType.equalsIgnoreCase(ScreenTrackResource.EVENT_ENTERED) || screenEventType.equalsIgnoreCase(ScreenTrackResource.EVENT_EXITED) ){