fixed class issue