Repair address calculation so that it matches the Wire standard.