Fix bug with updating claims