Fixed redeclaration