fix the nil-cleaning
make booleans not null