Fix redefinition