class name fix, debugger remove