fix data collection.