Fixes performance tracking data handler