fixed class redeclare