latest fixes for count