Fix argument creation