Fix redefinition error