Fixed ClassSelection