Fixed getCount as well