Fixing alphabetical sorting of classes