better output address handling