diff --git a/src/main/java/org/parabot/core/Context.java b/src/main/java/org/parabot/core/Context.java
index 02aff4a..f7df125 100644
--- a/src/main/java/org/parabot/core/Context.java
+++ b/src/main/java/org/parabot/core/Context.java
@@ -177,14 +177,19 @@ public class Context {
         	classPath.dump(new File(Directories.getWorkspace(), "dump.jar"));
         	Core.verbose("Done.");
         }
-        try {
-            Applet applet = Test.invokeZBU();
-            if(applet != null) {
-                setApplet(applet);
-            }
-        } catch (NoSuchMethodException | InvocationTargetException | ClassNotFoundException | IllegalAccessException | NoSuchFieldException | InstantiationException e) {
-            e.printStackTrace();
+        Applet applet = serverProvider.fetchApplet();
+        // if applet is null the server provider will call setApplet itself
+        if(applet != null) {
+            setApplet(applet);
         }
+//        try {
+//            Applet applet = Test.invokeZBU();
+//            if(applet != null) {
+//                setApplet(applet);
+//            }
+//        } catch (NoSuchMethodException | InvocationTargetException | ClassNotFoundException | IllegalAccessException | NoSuchFieldException | InstantiationException e) {
+//            e.printStackTrace();
+//        }
     }
     
     /**