fix deprecated PhoneNumber