fix 0 not null round 2