fix NULL
minor_edit