add check for numeric fields