Fix redeclaration issue