diff --git a/pom.xml b/pom.xml
index becc849..8b3ce52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <groupId>me.clip</groupId>
   <artifactId>placeholderapi</artifactId>
 
-  <version>2.10.1</version>
+  <version>2.10.1-DEV-${BUILD_NUMBER}</version>
   <name>PlaceholderAPI</name>
   <description>An awesome placeholder provider!</description>
   <url>http://extendedclip.com</url>
diff --git a/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
index 4f5d69e..1f1573c 100644
--- a/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
+++ b/src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java
@@ -137,18 +137,15 @@ public class PlaceholderAPIPlugin extends JavaPlugin {
       Class.forName("org.bukkit.event.server.ServerLoadEvent");
       new ServerLoadEventListener(this);
     } catch (ExceptionInInitializerError | ClassNotFoundException exception) {
-      Bukkit.getScheduler().runTaskLater(this, new Runnable() {
-        @Override
-        public void run() {
-          getLogger().info("Placeholder expansion registration initializing...");
-          //fetch any hooks that may have registered externally onEnable first otherwise they will be lost
-          final Map<String, PlaceholderHook> alreadyRegistered = PlaceholderAPI.getPlaceholders();
-          getExpansionManager().registerAllExpansions();
-          if (alreadyRegistered != null && !alreadyRegistered.isEmpty()) {
-            alreadyRegistered.entrySet().stream().forEach(hook -> PlaceholderAPI.registerPlaceholderHook(hook.getKey(), hook.getValue()));
-          }
+      Bukkit.getScheduler().runTaskLater(this, () -> {
+        getLogger().info("Placeholder expansion registration initializing...");
+        //fetch any hooks that may have registered externally onEnable first otherwise they will be lost
+        final Map<String, PlaceholderHook> alreadyRegistered = PlaceholderAPI.getPlaceholders();
+        getExpansionManager().registerAllExpansions();
+        if (alreadyRegistered != null && !alreadyRegistered.isEmpty()) {
+          alreadyRegistered.forEach(PlaceholderAPI::registerPlaceholderHook);
         }
-      }, 20*15);
+      }, 1);
     }
     if (config.checkUpdates()) {
       new UpdateChecker(this).fetch();