Thanks for this.  After inspecting aerial imagery, it turns out this second building was added much later, probably owned by the same people who have the existing house.  I moved the address to the gate, it will fix the problem.