Improve awkward counts checking