Fix phone field rewriting