Fixed class callign and checking