diff --git a/querydsl-core/src/main/java/com/querydsl/core/support/Normalization.java b/querydsl-core/src/main/java/com/querydsl/core/support/Normalization.java
index 6d837f69b..9ba286ebc 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/support/Normalization.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/support/Normalization.java
@@ -26,13 +26,13 @@ public final class Normalization {
 
     // TODO simplify
     private static final Pattern FULL_OPERATION = Pattern.compile(
-            "(?<![\\d\\*/\"\\?' ])" + "(\\b|\\(|\\s+)"  +
+            "(?<![\\d*/\"?' ])" + "(\\b|\\(|\\s+)"  +
             "(" + NUMBER + WS + "[+\\-/*]" + WS + ")+" + NUMBER + WS +
-            "(?![\\d\\*/\"' ])");
+            "(?![\\d*/\"' ])");
 
     private static final Pattern[] OPERATIONS = {
-            Pattern.compile(NUMBER + WS + "(\\*|/)" + WS + NUMBER),
-            Pattern.compile(NUMBER + WS + "(\\+|\\-)" + WS + NUMBER),
+            Pattern.compile(NUMBER + WS + "([*/])" + WS + NUMBER),
+            Pattern.compile(NUMBER + WS + "([+-])" + WS + NUMBER),
     };
 
     private static String normalizeOperation(String queryString) {