Fix the argument indices