Fix concurrent modification in feed-units loop