bug fix isRightClass