Fix ordering, again, this time we stick to whatever is in the db.