Fix non-null constraint