Bug fix: counting extra tricks properly