fixup current class flag