anthonyhu Fix data collection