errant redeclaration fix