Fixed re-ordering of criteria.