deserialization / consistency check improved