diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/BukkitCustomFishingPluginImpl.java b/core/src/main/java/net/momirealms/customfishing/bukkit/BukkitCustomFishingPluginImpl.java
index c3ba60ff..1abc74ef 100644
--- a/core/src/main/java/net/momirealms/customfishing/bukkit/BukkitCustomFishingPluginImpl.java
+++ b/core/src/main/java/net/momirealms/customfishing/bukkit/BukkitCustomFishingPluginImpl.java
@@ -236,6 +236,8 @@ public class BukkitCustomFishingPluginImpl extends BukkitCustomFishingPlugin {
         this.storageManager.disable();
         this.hologramManager.disable();
         this.commandManager.unregisterFeatures();
+        this.scheduler.shutdownScheduler();
+        this.scheduler.shutdownExecutor();
     }
 
     @Override
diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/game/BukkitGameManager.java b/core/src/main/java/net/momirealms/customfishing/bukkit/game/BukkitGameManager.java
index 3f8eab5c..1c8efb07 100644
--- a/core/src/main/java/net/momirealms/customfishing/bukkit/game/BukkitGameManager.java
+++ b/core/src/main/java/net/momirealms/customfishing/bukkit/game/BukkitGameManager.java
@@ -933,7 +933,7 @@ public class BukkitGameManager implements GameManager {
                         @Override
                         protected void tick() {
                             timer++;
-                            if (timer % (21 - settings.difficulty() / 5) == 0) {
+                            if (timer % ((106 - (int) settings.difficulty()) / 5) == 0) {
                                 movePointer();
                             }
                             showUI();