Bypass the None arguments
MOD: change version v3.5.0