Fix problem with the arguments.