#5 #10 #16 bug fixed with number field.