Fix cellCount