Fix problem where duplicate object headers were not always being selected correctly...