More attempt to fix the data counting stuff