Fixed return of chosen address to user