fix for "count issue"
fix for "count issue"