fix: nullable must check the whole state