data collector fixed