Class table bug fix