fix non-null