fixup dup constants after merging PR