diff --git a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/jspel/ELGeneratorVisitor.java b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/jspel/ELGeneratorVisitor.java
index dfd3cd2..30e1824 100644
--- a/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/jspel/ELGeneratorVisitor.java
+++ b/bundles/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/java/jspel/ELGeneratorVisitor.java
@@ -67,7 +67,7 @@
 	private StringBuffer fResult;
 	private Map fCodeMap;
 	private int fOffsetInUserCode;
-	private int methodCounter = 0;
+	private static int methodCounter = 0;
 	private JSPTranslator fTranslator = null;
 	private int fContentStart;
 	private static Map fOperatorMap;
@@ -195,6 +195,10 @@
 		return(node.childrenAccept(this, data));
 	}
 
+	static synchronized int getMethodCounter() {
+		return methodCounter++;
+	}
+	
 	/**
 	 * Handle top-level expression
 	 */
@@ -202,7 +206,7 @@
 		int start = node.getFirstToken().beginColumn - 1;
 		int end = node.lastToken.endColumn - 1;
 		append(fExpressionHeader1, start, start);
-		append(Integer.toString(methodCounter++), start, start);
+		append(Integer.toString(getMethodCounter()), start, start);
 		append(fExpressionHeader2, start, start);
 		
 		Object retval = node.childrenAccept(this, data);
