diff --git a/src/helma/util/HtmlEncoder.java b/src/helma/util/HtmlEncoder.java
index 650d6a24..897af8ae 100644
--- a/src/helma/util/HtmlEncoder.java
+++ b/src/helma/util/HtmlEncoder.java
@@ -634,7 +634,7 @@ public final class HtmlEncoder {
                     }
 
                     // we didn't reach a break, so encode as entity unless inside a tag
-                    if (insideTag) {
+                    if (insideMacroTag) {
                         ret.append('&');
                     } else {
                         ret.append("&");