BUG on new class code.