fixed class redeclaration