Fix the order of addresses