diff --git a/plugins/org.eclipse.epsilon.common/src/org/eclipse/epsilon/common/parse/AST.java b/plugins/org.eclipse.epsilon.common/src/org/eclipse/epsilon/common/parse/AST.java
index b0fca42dc..0a540c45c 100644
--- a/plugins/org.eclipse.epsilon.common/src/org/eclipse/epsilon/common/parse/AST.java
+++ b/plugins/org.eclipse.epsilon.common/src/org/eclipse/epsilon/common/parse/AST.java
@@ -26,6 +26,10 @@ public class AST extends CommonTree {
 	protected URI uri;
 	protected Integer line = null;
 	protected Integer column = null;
+
+	// Optional: only used for undoing EGL escaping
+	protected Integer length = null;
+
 	protected Region region;
 	protected AST annotations;
 	protected boolean imaginary;
@@ -282,7 +286,7 @@ public Region getRegion() {
 			Position endPosition = new Position();
 			if (!isImaginary()) {
 				endPosition.setLine(this.getLine());
-				endPosition.setColumn(this.getColumn() + ((CommonToken)getToken()).getStopIndex() - ((CommonToken)getToken()).getStartIndex() + 1);
+				endPosition.setColumn(this.getColumn() + getLength());
 			}
 			else {
 				endPosition.setLine(-1);
@@ -381,6 +385,17 @@ public String toExtendedStringTree() {
 		return toExtendedStringTree(0);
 	}
 	
+	public Integer getLength() {
+		if (length == null) {
+			return ((CommonToken)getToken()).getStopIndex() - ((CommonToken)getToken()).getStartIndex() + 1;
+		}
+		return length;
+	}
+
+	public void setLength(Integer length) {
+		this.length = length;
+	}
+
 	protected String toExtendedStringTree(int indent) {
 		String toString = "";
 		for (int i=0;i<indent;i++) {
diff --git a/plugins/org.eclipse.epsilon.egl.engine/src/org/eclipse/epsilon/egl/preprocessor/Preprocessor.java b/plugins/org.eclipse.epsilon.egl.engine/src/org/eclipse/epsilon/egl/preprocessor/Preprocessor.java
index 7edab790b..2d40bd700 100644
--- a/plugins/org.eclipse.epsilon.egl.engine/src/org/eclipse/epsilon/egl/preprocessor/Preprocessor.java
+++ b/plugins/org.eclipse.epsilon.egl.engine/src/org/eclipse/epsilon/egl/preprocessor/Preprocessor.java
@@ -339,7 +339,10 @@ protected boolean updateRegionsOfStaticTextASTs(AST ast) {
 	}
 	
 	public void updateASTLocations(AST ast) {
-		ast.setColumn(getTrace().getEglColumnNumberFor(ast.getLine(), ast.getColumn()));
+		final int eglStartColumn = getTrace().getEglColumnNumberFor(ast.getLine(), ast.getColumn());
+		final int eglEndColumn = getTrace().getEglColumnNumberFor(ast.getLine(), ast.getColumn() + ast.getLength());
+		ast.setColumn(eglStartColumn);
+		ast.setLength(eglEndColumn - eglStartColumn);
 		ast.setLine(getTrace().getEglLineNumberFor(ast.getLine()));
 		
 		for (Token token : ast.getExtraTokens()) {