Temporary fix for PO addresses