Fixed class redeclaration