Fix issue 2 - Number-type fields should allow Integer or Long