Fixing a multi-master divergence