fixing this class