diff --git a/panda-gear/src/main/java/panda/mvc/view/tag/Property.java b/panda-gear/src/main/java/panda/mvc/view/tag/Property.java
index b93bd5cea..dd8e95515 100644
--- a/panda-gear/src/main/java/panda/mvc/view/tag/Property.java
+++ b/panda-gear/src/main/java/panda/mvc/view/tag/Property.java
@@ -261,7 +261,7 @@ private String getCodeText(Map m, Object k) {
 		if (v == null) {
 			v = k;
 		}
-		return (k == null ? Strings.EMPTY : k.toString());
+		return (v == null ? Strings.EMPTY : v.toString());
 	}
 
 	private String escape(String value) {