Fix multi-diff scalability weirdness issue