fix some class problem