Fix WAVE-399 with Diff r2