Fixed claimant snapshot handling