current class bug fix