Fix argument index on invocation