diff --git a/RNameToGMCP.xml b/RNameToGMCP.xml
index 266a138..d3b9441 100644
--- a/RNameToGMCP.xml
+++ b/RNameToGMCP.xml
@@ -50,9 +50,14 @@ function OnPluginBroadcast(msg, id, name, text)
 					ColourTell (RGBColourToName (v.textcolour),
 					RGBColourToName (v.backcolour),
 					v.text)
+				    break;
 				end
 			end
-			ColourTell("white", "", " (" .. gmcp("room.info.num") .. ")")
+			-- ColourTell("white", "", " (" .. gmcp("room.info.num") .. ")")
+			Hyperlink ("mapper goto " .. gmcp("room.info.num"),
+                        	   "(" .. gmcp("room.info.num") .. ")",
+                        	   "",
+                        	   "white", "black", 0)
 			Note("")
 		end
 	end
@@ -62,4 +67,4 @@ end
 
 
 </muclient>
-	
\ No newline at end of file
+