fixed redefinition error