fix to ensure the latest Default address is used