Trucount fix from Andy