Fix possibly harmful outbound addressing. Patch by Kenan Gillet.