Fix Klass ordering...more?