diff --git a/src/main/java/org/caosdb/server/query/CQLParser.g4 b/src/main/java/org/caosdb/server/query/CQLParser.g4
index b2e3cb5d74ba492836281291373425dbcc7281b8..6aea8c55f006cd9127d68f0c09e1654d9f9842a9 100644
--- a/src/main/java/org/caosdb/server/query/CQLParser.g4
+++ b/src/main/java/org/caosdb/server/query/CQLParser.g4
@@ -495,8 +495,10 @@ number_with_unit
 
 unit
 :
-	(~(WHITE_SPACE | DOT))+
-	| NUM SLASH (~(WHITE_SPACE | DOT))+
+	(~(WHITE_SPACE | WHICH | HAS_A | WITH | WHERE | DOT | AND | OR ))
+	(~(WHITE_SPACE))*
+	|
+	NUM SLASH (~(WHITE_SPACE))+
 ;
 
 location returns [String str]