Fixws  BUG IN THE CRITERIA RESOLVER.