Fixed a bug on empty Addresses