Fix preferred address bug