Better handling of zero in number fields