Fixed class data issue