should fix secret issues (drawn, counted multiple times) (#400)