diff --git a/AndorsTrail/res/values/authors.xml b/AndorsTrail/res/values/authors.xml
index 72d9e17eb..3078720ad 100644
--- a/AndorsTrail/res/values/authors.xml
+++ b/AndorsTrail/res/values/authors.xml
@@ -16,6 +16,8 @@
 		Additional programming by Ethan Wessel<br />
 		Additional programming by Scott Lund<br />
 		Additional programming by <a href="https://github.com/Zukero">Kevin Pochat</a><br />
+		Additional programming by Lucas Delvallet<br />
+		Additional programming by Florian Doublet<br />
 		Additional graphics by Karvis<br />
 		Russian translation by Dreamer..., e.solodookhin, shell.andor, konstmih, istasman, Aleksey Kabanov, Alexander Zubok, Paul Sulemenkov and dromoz<br />
 		Italian translation by k6blue, liogiu, Joker and Andrea Luciano Damico<br />
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
index 17218b434..f6137d07b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
@@ -1,6 +1,8 @@
 package com.gpl.rpg.AndorsTrail.controller;
 
 import android.content.res.Resources;
+import android.util.Log;
+
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.context.ControllerContext;
 import com.gpl.rpg.AndorsTrail.context.WorldContext;
@@ -171,8 +173,8 @@ public final class ConversationController {
 	}
 
 	private void addRemoveQuestProgressReward(Player player, String questID, int questProgress) {
-		Quest currentQuest = world.quests.getQuest(questID);
-		player.removeQuestProgress(currentQuest,questProgress);
+        QuestProgress progress = new QuestProgress(questID, questProgress);
+		boolean removed = player.removeQuestProgress(progress);
 	}
 
 	private void addDropListReward(Player player, String droplistID, ScriptEffectResult result) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
index d39dc0405..12a66bea6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
@@ -159,8 +159,10 @@ public final class Player extends Actor {
 		return true; //Progress was added.
 	}
 
-	public void removeQuestProgress(Quest quest, int removeProgress){
-		questProgress.get(quest.questID).remove(progress);
+	public boolean removeQuestProgress(QuestProgress progress){
+        if (!hasExactQuestProgress(progress.questID, progress.progress)) return false;
+		questProgress.get(progress.questID).remove(progress.progress);
+		return true; //Progress was removed.
 	}
 
 	public void recalculateLevelExperience() {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
index f86d28679..e7d1399bd 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
@@ -14,7 +14,6 @@ public final class Requirement {
 		,spentGold
 		,consumedBonemeals
 		,hasActorCondition
-		,removeQuestProgress
 	}
 
 	public final RequirementType requireType;