Data gatherer fix