fix redefinition issue