Change not null condition