Fixing args parting