Fixed the re-evaluation of claims