Merge pull request #2023 from futurepaul/fallback-to-address