Fixed another overcounting bug