Fixed bug related to addresses without a UI