fix data collect