Should fix multiple-address-per-dp bug