Class list bug fix