Added a check on the number fields