diff --git a/build.gradle b/build.gradle
index 2cfda41..8a44139 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ java {
 }
 
 group = 'me.playbosswar.com'
-version = '8.16.3'
+version = '8.16.4'
 description = 'CommandTimer'
 
 repositories {
@@ -74,7 +74,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'me.playbosswar.com'
             artifactId = 'commandtimer'
-            version = '8.16.3'
+            version = '8.16.4'
 
             from components.java
         }
diff --git a/java17-build.gradle b/java17-build.gradle
index 0a77a5c..69a959c 100644
--- a/java17-build.gradle
+++ b/java17-build.gradle
@@ -10,7 +10,7 @@ java {
 
 
 group = 'me.playbosswar.com'
-version = '8.16.3'
+version = '8.16.4'
 description = 'CommandTimer'
 
 repositories {
@@ -63,7 +63,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'me.playbosswar.com'
             artifactId = 'commandtimer-java17'
-            version = '8.16.3'
+            version = '8.16.4'
 
             from components.java
         }
diff --git a/java21-build.gradle b/java21-build.gradle
index 6b020ba..65683fe 100644
--- a/java21-build.gradle
+++ b/java21-build.gradle
@@ -10,7 +10,7 @@ java {
 
 
 group = 'me.playbosswar.com'
-version = '8.16.3'
+version = '8.16.4'
 description = 'CommandTimer'
 
 repositories {
@@ -67,7 +67,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'me.playbosswar.com'
             artifactId = 'commandtimer-java21'
-            version = '8.16.3'
+            version = '8.16.4'
             from components.java
         }
     }
diff --git a/src/main/java/me/playbosswar/com/hooks/PAPIPlaceholders.java b/src/main/java/me/playbosswar/com/hooks/PAPIPlaceholders.java
index 0c9078b..bf9806e 100644
--- a/src/main/java/me/playbosswar/com/hooks/PAPIPlaceholders.java
+++ b/src/main/java/me/playbosswar/com/hooks/PAPIPlaceholders.java
@@ -63,7 +63,7 @@ public String onPlaceholderRequest(Player player, @NotNull String identifier) {
         String fallbackMessage = placeholder.getFallbackMessage();
 
         if(placeholder.getTaskName().equals("ALLTASKS")) {
-            ScheduledTask scheduledTask = CommandTimerPlugin.getInstance().getTasksManager().getNextScheduledTaskForTask(task);
+            ScheduledTask scheduledTask = CommandTimerPlugin.getInstance().getTasksManager().getNextScheduledTask();
             if(scheduledTask == null) {
                 return fallbackMessage;
             }
diff --git a/src/main/java/me/playbosswar/com/tasks/TasksManager.java b/src/main/java/me/playbosswar/com/tasks/TasksManager.java
index bfff338..494ac50 100644
--- a/src/main/java/me/playbosswar/com/tasks/TasksManager.java
+++ b/src/main/java/me/playbosswar/com/tasks/TasksManager.java
@@ -420,6 +420,11 @@ public void populateScheduleForTask(Task task) {
         }
     }
 
+    public ScheduledTask getNextScheduledTask() {
+        return scheduledTasks.peek();
+    }
+
+
     public ScheduledTask getNextScheduledTaskForTask(Task task) {
         return scheduledTasks.stream().filter(scheduledTask -> scheduledTask.getTask().getId().equals(task.getId())).min(Comparator.comparing(ScheduledTask::getDate)).orElse(null);
     }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 5120079..40e246b 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 main: me.playbosswar.com.CommandTimerPlugin
 name: "CommandTimer"
-version: "8.16.3"
+version: "8.16.4"
 description: "Schedule commands like you want"
 author: PlayBossWar
 api-version: 1.13