Fix gatherer bug