Empty fields are undefined instead of null