Board Game Arena

Just had a game where we ended with 12 black stones on the map, 10 in hands, and 1 in the axe track, for a total of 23 visible (and possibly more in the bag?). This is too many - should be a max of 21 stones of each colour in the whole game, right?