diff --git a/main/src/main/java/me/blackvein/quests/listeners/CmdExecutor.java b/main/src/main/java/me/blackvein/quests/listeners/CmdExecutor.java
index dc3c13962..45a0057f1 100644
--- a/main/src/main/java/me/blackvein/quests/listeners/CmdExecutor.java
+++ b/main/src/main/java/me/blackvein/quests/listeners/CmdExecutor.java
@@ -181,6 +181,12 @@ public class CmdExecutor implements CommandExecutor {
 					if (quester.getCurrentQuests().isEmpty() == false) {
 						for (Quest q : quester.getCurrentQuests().keySet()) {
 							Stage stage = quester.getCurrentStage(q);
+							LinkedList<Stage> stages = q.getStages();
+							for (Stage s : stages) {
+								if (s.equals(quester.getCurrentStage(q))) {
+									System.out.println(ChatColor.LIGHT_PURPLE + "quest (" + Lang.get("stageEditorStage") + " " +  (stages.indexOf(s) + 1) + ")");
+								}
+							}
 							q.updateCompass(quester, stage);
 							if (plugin.getQuester(player.getUniqueId()).getQuestData(q).delayStartTime == 0) {
 								String msg = Lang.get(player, "questObjectivesTitle");
@@ -536,14 +542,10 @@ public class CmdExecutor implements CommandExecutor {
 			cs.sendMessage(ChatColor.YELLOW + Lang.get("currentQuest") + " " + ChatColor.DARK_PURPLE + Lang.get("none"));
 		} else {
 			cs.sendMessage(ChatColor.YELLOW + Lang.get("currentQuest"));
-			for (Quest q : quester.getCurrentQuests().keySet()) {
-				String msg = ChatColor.LIGHT_PURPLE + " - " + ChatColor.DARK_PURPLE + q.getName();
-				LinkedList<Stage> stages = q.getStages();
-				for (Stage s : stages) {
-					if (s.equals(quester.getCurrentStage(q))) {
-						msg += ChatColor.LIGHT_PURPLE + " (" + Lang.get("stageEditorStage") + " " +  (stages.indexOf(s) + 1) + ")";
-					}
-				}
+			for (Entry<Quest, Integer> set : quester.getCurrentQuests().entrySet()) {
+				Quest q = set.getKey();
+				String msg = ChatColor.LIGHT_PURPLE + " - " + ChatColor.DARK_PURPLE + q.getName()
+					+ ChatColor.LIGHT_PURPLE + " (" + Lang.get("stageEditorStage") + " " +  (set.getValue() + 1) + ")";
 				cs.sendMessage(msg);
 			}
 		}
diff --git a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
index 3d0c4d14b..466407f3e 100644
--- a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
+++ b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
@@ -783,7 +783,7 @@ public class PlayerListener implements Listener {
 				quester.checkQuest(quest);
 			}
 			for (Quest quest : quester.getCurrentQuests().keySet()) {
-				if (quester.getCurrentStage(quest).getDelay() > -1) {
+				if (quester.getCurrentStage(quest).getDelay() > -1 && quester.getQuestData(quest).delayOver == false) {
 					quester.startStageTimer(quest);
 				}
 			}
diff --git a/main/src/main/java/me/blackvein/quests/timers/StageTimer.java b/main/src/main/java/me/blackvein/quests/timers/StageTimer.java
index ddb65d2e2..377132aac 100644
--- a/main/src/main/java/me/blackvein/quests/timers/StageTimer.java
+++ b/main/src/main/java/me/blackvein/quests/timers/StageTimer.java
@@ -52,6 +52,7 @@ public class StageTimer implements Runnable {
 				}
 				quest.completeQuest(quester);
 			} else {
+				System.out.println("get delay = " + quester.getCurrentStage(quest).getDelay());
 				Stage currentStage = quester.getCurrentStage(quest);
 				int stageNum = quester.getCurrentQuests().get(quest) + 1;
 				quester.hardQuit(quest);