diff --git a/src/jastadd/ast/Trace.jrag b/src/jastadd/ast/Trace.jrag
index b22c6cc053d6bfd7b21cb2851695b2a64617c546..0e3da31b33bc80d90d74612af2599d1c4ebc13c7 100644
--- a/src/jastadd/ast/Trace.jrag
+++ b/src/jastadd/ast/Trace.jrag
@@ -100,7 +100,8 @@ aspect Trace {
   syn String AttrDecl.traceEndAttr() = trace("end " + traceSignature());
   syn String AttrDecl.traceEndCachedAttr() = trace("end cached " + traceSignature());
 
-  syn String CollEq.escapeConditionForTemplate() = getCondition().replace("\n", " ").replace("\"", "\\\"");
+  syn String CollEq.escapeConditionForTemplate() = 
+      getCondition().replace("\n", " ").replace("\r", " ").replace("\"", "\\\"");
 }
 
 aspect NewTrace {