Fix up a bit for Claim A...