Fix predicate handling