diff --git a/db/re/quest_db.txt b/db/re/quest_db.txt
index 9210d30b62..cbf671d4f3 100644
--- a/db/re/quest_db.txt
+++ b/db/re/quest_db.txt
@@ -783,19 +783,19 @@
 5110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"The Rumored Character"
 5111,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"To the Lab..."
 5112,259200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Laboratory Restricted Access"
-5113,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Lord Knight"
-5114,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Paladin"
-5115,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] High Priest"
-5116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Champion"
-5117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] High Wizard"
-5118,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Professor"
-5119,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Whitesmith"
-5120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Creator"
-5121,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Assassin Cross"
-5122,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Stalker"
-5123,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Sniper"
-5124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Clown"
-5125,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Gypsy"
+5113,0,1646,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Lord Knight"
+5114,0,2235,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Paladin"
+5115,0,1649,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] High Priest"
+5116,0,2238,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Champion"
+5117,0,1651,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] High Wizard"
+5118,0,2237,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Professor"
+5119,0,1648,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Whitesmith"
+5120,0,2236,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Creator"
+5121,0,1647,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Assassin Cross"
+5122,0,2239,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Stalker"
+5123,0,1650,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Sniper"
+5124,0,2240,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Clown"
+5125,0,2241,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"[Rest] Gypsy"
 
 // Kagerou/Oboro Job Quest
 5131,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Strange Conversation"
diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt
index a814f6146e..0a198be915 100644
--- a/npc/re/instances/WolfchevLaboratory.txt
+++ b/npc/re/instances/WolfchevLaboratory.txt
@@ -2051,12 +2051,20 @@ OnMyMobDead:
 		mes "^FF0000 Check up your inventory. You got too many items to carry out the quest. ^000000";
 		close;
 	}
-	.@all_quests_complete = true;
 	for(.@i = 5113; .@i <= 5125; .@i++) {
-		if (checkquest(.@i, HUNTING) != 2)
-			.@all_quests_complete = false;
+		switch( checkquest(.@i,HUNTING) ) {
+		case -1:
+			break;
+		case 0:
+		case 1:
+			.@all_quests_complete += 1;
+			break;
+		case 2:
+			.@all_quests_complete += 2;
+			break;
+		}
 	}
-	if (.@all_quests_complete) {
+	if (.@all_quests_complete == 26) {
 		// Quests Complete. Get Rewards.
 		if (lght_duk01 == 8) {
 			// First time beating the instance.
@@ -2134,7 +2142,7 @@ OnMyMobDead:
 			end;
 		}
 	} else {
-		if (!.@all_quests_complete) {
+		if (.@all_quests_complete == 0) {
 			mes "[Wolfchev]";
 			mes "I was looking at the system.... don't know who made this..... but it's so complicated to get..no idea...";
 			next;