Fixed generated args list