Fixing semi-infinite loop where it resolves the same claim repeatedly