fixed redefinition