I once thought you could avoid all this using cards instead of dices. But the cards don't work as well.
In a set of 36 cards, 2 and 12 should be included. But I just played again and there was no 2 in 97 cards. Funny, when you think the cards will be shuffled after all 36 cards were played. Maybe they shuffle after every card. But this makes no sence, except if you want the behaviour of dices again.