Prepare for issue count, part 2