adapt to recent Gatherer changes