Fix argument creation logic