(PUP-2073) fix for multiple diff_args