fixed item count check related #22