Handle stash count as well