Another fix for proper count