Respect pieces count

Fix a bug where pieces count was showing as higher than it was