Bug fix for display of addresses can get swapped