diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
index 220363a8d..10d6ac757 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
@@ -111,7 +111,7 @@ public class Wandmaker extends NPC {
 						msg = Messages.get(this, "reminder_berry", Dungeon.hero.givenName());
 						break;
 				}
-				GameScene.show(new WndQuest(this, Utils.format(msg, Dungeon.hero.givenName())));
+				GameScene.show(new WndQuest(this, msg));
 			}
 			
 		} else {
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/Messages.java b/src/com/shatteredpixel/shatteredpixeldungeon/messages/Messages.java
index 42e51a227..ad915ec8c 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/Messages.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/Messages.java
@@ -24,6 +24,13 @@ import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
+/*
+	Simple wrapper class for java resource bundles.
+
+	The core idea here is that each string resource's key is a combination of the class definition and a local value.
+	An object or static method would usually call this with an object/class reference (usually its own) and a local key.
+	This means that an object can just ask for "name" rather than, say, "items.weapon.enchantments.death.name"
+ */
 public class Messages {
 
 	private static ResourceBundle strings =