diff --git a/emojicompat/AssetEmojiCompatConfig.java b/emojicompat/AssetEmojiCompatConfig.java
index f62d86aef..53e1616a3 100644
--- a/emojicompat/AssetEmojiCompatConfig.java
+++ b/emojicompat/AssetEmojiCompatConfig.java
@@ -58,7 +58,7 @@ public class AssetEmojiCompatConfig extends EmojiCompat.Config {
         private AssetMetadataLoader(@NonNull Context context, 
                                     // NEW
                                     String assetName) {
-            this.mContext = context;
+            this.mContext = context.getApplicationContext();
             // NEW
             this.assetName = assetName;
         }
@@ -69,7 +69,7 @@ public class AssetEmojiCompatConfig extends EmojiCompat.Config {
         @RequiresApi(19)
         public void load(@NonNull EmojiCompat.MetadataRepoLoaderCallback loaderCallback) {
             Preconditions.checkNotNull(loaderCallback, "loaderCallback cannot be null");
-            final InitRunnable runnable = new InitRunnable(mContext, loaderCallback, assetName);
+            final InitRunnable runnable = new InitRunnable(mContext, loaderCallback);
             final Thread thread = new Thread(runnable);
             thread.setDaemon(false);
             thread.start();
@@ -88,6 +88,7 @@ public class AssetEmojiCompatConfig extends EmojiCompat.Config {
                              final EmojiCompat.MetadataRepoLoaderCallback loaderCallback,
                              // NEW parameter
                              final String FONT_NAME) {
+            // This has been changed a bit in order to get some consistency
             this.context = context;
             this.loaderCallback = loaderCallback;
             this.FONT_NAME = FONT_NAME;
@@ -97,11 +98,11 @@ public class AssetEmojiCompatConfig extends EmojiCompat.Config {
         @Override
         public void run() {
             try {
-                final AssetManager assetManager = context.getAssets();
+                final AssetManager assetManager = mContext.getAssets();
                 final MetadataRepo resourceIndex = MetadataRepo.create(assetManager, FONT_NAME);
-                loaderCallback.onLoaded(resourceIndex);
+                mLoaderCallback.onLoaded(resourceIndex);
             } catch (Throwable t) {
-                loaderCallback.onFailed(t);
+                mLoaderCallback.onFailed(t);
             }
         }
     }