Null field fix