fixed the class issue