Fixing class listing ordering