fixed redeclare bug