Fix Klass ordering.