Attempt to fix per-player class data collection.