fixed a class re-declaration error possibility