classes bug fix