diff --git a/public/js/legacy/utils/datatype.js b/public/js/legacy/utils/datatype.js
index c5beba7842..1494aaa04e 100644
--- a/public/js/legacy/utils/datatype.js
+++ b/public/js/legacy/utils/datatype.js
@@ -148,12 +148,12 @@ function replace_all(s, t1, t2) {
 
 function keys(obj) { 
 	var mykeys=[];
-	for (key in obj) mykeys[mykeys.length]=key;
+	for (var key in obj) mykeys[mykeys.length]=key;
 	return mykeys;
 }
 function values(obj) { 
 	var myvalues=[];
-	for (key in obj) myvalues[myvalues.length]=obj[key];
+	for (var key in obj) myvalues[myvalues.length]=obj[key];
 	return myvalues;
 }
 
diff --git a/public/js/legacy/widgets/form/clientscriptAPI.js b/public/js/legacy/widgets/form/clientscriptAPI.js
index 5584ff71a2..539f8ff973 100644
--- a/public/js/legacy/widgets/form/clientscriptAPI.js
+++ b/public/js/legacy/widgets/form/clientscriptAPI.js
@@ -219,7 +219,7 @@ _f.Frm.prototype.call_server = function(method, args, callback) {
 }
 
 _f.Frm.prototype.get_files = function() {
-	return cur_frm.attachments.get_file_list().keys().sort();
+	return keys(cur_frm.attachments.get_file_list()).sort();
 }
 
 _f.Frm.prototype.set_query = function(fieldname, opt1, opt2) {
diff --git a/webnotes/utils/file_manager.py b/webnotes/utils/file_manager.py
index fe0bb46a5c..44657ba378 100644
--- a/webnotes/utils/file_manager.py
+++ b/webnotes/utils/file_manager.py
@@ -98,7 +98,7 @@ def save_file(fname, content, dt, dn):
 			os.remove(temp_fname)
 		else:
 			# get_new_version name
-			fname = get_new_fname_based_on_version(file_path, fname)
+			fname = get_new_fname_based_on_version(files_path, fname)
 			
 			# rename
 			os.rename(temp_fname, os.path.join(files_path, fname))