fixed class related issues