fix counts in toher places too