Fix classes order