ClassName bug fix