fix sublocation and classnum