Count API fix.