Fixed the DataCollector