gossip fix for big Backport