Bugfix in Criteria