Bugfix: Addresses are displayed incorrectly