Fixed ordering of classes