fix Criteria bug