fix regression in null field handling