Bugfix in argument marshalling.