fixed ordering by name