Fix from phone number fetching