BUGFIX: Count only the right amount!