Fix bugs for not deleting the phone