Fixing name_args issue