fixed missed not-null