Fix a bug with 'not null'