@@ -106,11 +106,11 @@
 	/* Substitute variables and convert to RPN first */
 	tokens = [OFMutableArray array];
 	operators = [OFMutableArray array];
 	for (OFString *token in [condition
 	    componentsSeparatedByString: @" "
-				options: OF_STRING_SKIP_EMPTY]) {
+				options: OFStringSkipEmptyComponents]) {
 		unsigned precedence;
 		OFUnichar c;
 
 		if ([token isEqual: @"("]) {
 			[operators addObject: @"("];