Fixing bug with criteria re-ordering.