Bugfix: don't overuse limited ExtractAddress