Redeclare fix