Fix null states