Bugfix: Addresses are not displayed or displayed incorrectly