diff --git a/lib/ansible/plugins/lookup/csvfile.py b/lib/ansible/plugins/lookup/csvfile.py
index e15fd3fc36f..5052342e8a4 100644
--- a/lib/ansible/plugins/lookup/csvfile.py
+++ b/lib/ansible/plugins/lookup/csvfile.py
@@ -75,7 +75,7 @@ class LookupModule(LookupBase):
             if paramvals['delimiter'] == 'TAB':
                 paramvals['delimiter'] = "\t"
 
-            lookupfile = self._loader.path_dwim_relative(basedir, 'files', term)
+            lookupfile = self._loader.path_dwim_relative(basedir, 'files', paramvals['file'])
             var = self.read_csv(lookupfile, key, paramvals['delimiter'], paramvals['default'], paramvals['col'])
             if var is not None:
                 if type(var) is list:
diff --git a/v1/ansible/runner/lookup_plugins/csvfile.py b/v1/ansible/runner/lookup_plugins/csvfile.py
index ce5a2b77d2f..a9ea8ed90cd 100644
--- a/v1/ansible/runner/lookup_plugins/csvfile.py
+++ b/v1/ansible/runner/lookup_plugins/csvfile.py
@@ -63,7 +63,10 @@ class LookupModule(object):
                 for param in params[1:]:
                     name, value = param.split('=')
                     assert(name in paramvals)
-                    paramvals[name] = value
+                    if name == 'delimiter':
+                        paramvals[name] = str(value)
+                    else:
+                        paramvals[name] = value
             except (ValueError, AssertionError), e:
                 raise errors.AnsibleError(e)