ADDED count check