Fixing data collection bug