Fixed overcounting errors