Restored internal consistency check