Fix 1320 regression in resolve_unclaimed