diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java
index c33a0e3..ae8de80 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/JSPTranslator.java
@@ -932,7 +932,7 @@
 			for (int i = 0; i < taglibVars.length; i++) {
 				if (taglibVars[i].getScope() == VariableInfo.AT_END) {
 					decl = taglibVars[i].getDeclarationString();
-					appendToBuffer(decl, fUserCode, false, customTag);
+					appendToBuffer(decl, fUserCode, true, customTag);
 				}
 			}
 		}
@@ -963,7 +963,7 @@
 		for (int i = 0; i < taglibVars.length; i++) {
 			if (taglibVars[i].getScope() == VariableInfo.AT_BEGIN) {
 				decl = taglibVars[i].getDeclarationString();
-				appendToBuffer(decl, fUserCode, false, customTag);
+				appendToBuffer(decl, fUserCode, true, customTag);
 			}
 		}
 		boolean isEmptyTag = false;
@@ -991,7 +991,7 @@
 		for (int i = 0; i < taglibVars.length; i++) {
 			if (taglibVars[i].getScope() == VariableInfo.NESTED) {
 				decl = taglibVars[i].getDeclarationString();
-				appendToBuffer(decl, fUserCode, false, customTag);
+				appendToBuffer(decl, fUserCode, true, customTag);
 			}
 		}
 		/*
