allow null fields and fix decimal error