diff --git a/CHANGESTODO b/CHANGESTODO
index 9b2d728..fa82e42 100644
--- a/CHANGESTODO
+++ b/CHANGESTODO
@@ -12,6 +12,10 @@ ________________________________________________________________________
 ________________________________________________________________________
 == NEXT RELEASE ========================================================
 ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
+- MASQUERADE nicks show up with recipient's nick sometimes. bad. vars were
+  "_nick":"shouldbe","_nick_place":"welcome","_nick_local":"reallywas"
+  it should have shown either shouldbe or reallywas, but it showed my own.
+
 - interserver xmpp /me expects no leading newline, but pidgin recently
   started sending one
 
diff --git a/world/net/usercmd.i b/world/net/usercmd.i
index bffc9e7..2ff1c85 100644
--- a/world/net/usercmd.i
+++ b/world/net/usercmd.i
@@ -464,8 +464,8 @@ cmd(a, args, dest, command) {
 	case "examine":
 		//examine(sizeof(args) > 1 ? args[1] : dest);
 		examine(sizeof(args) > 1 ? args[1] : dest, 0,
-		       	sizeof(args) > 2 ? args[2] : 0,
-		       	/* sizeof(args) > 3 ? args[3] : */ 0);
+		       	sizeof(args) > 2 ? args[2] : 0, 0,
+		       	sizeof(args) > 3 ? args[3] : 0);
 		return 1;
 #ifdef ALIASES
 	case "al":