diff --git a/public/js/wn/form/attachments.js b/public/js/wn/form/attachments.js
index 636c7ca288..4730e1cba7 100644
--- a/public/js/wn/form/attachments.js
+++ b/public/js/wn/form/attachments.js
@@ -173,7 +173,7 @@ wn.ui.form.Attachments = Class.extend({
 	},
 	refresh_attachment_select_fields: function() {
 		for(var i=0; i<this.frm.fields.length; i++) {
-			if(this.frm.fields[i].attach_files) {
+			if(this.frm.fields[i].df.options=="attach_files:") {
 				var fieldname = this.frm.fields[i].df.fieldname;
 				refresh_field(fieldname);
 				if(this.frm.doc[fieldname]!=undefined && !inList(this.frm.fields[i].df.options.split("\n"), this.frm.doc[fieldname])) {
diff --git a/public/js/wn/upload.js b/public/js/wn/upload.js
index 57468abe8a..1985957a8f 100644
--- a/public/js/wn/upload.js
+++ b/public/js/wn/upload.js
@@ -62,9 +62,9 @@ wn.upload = {
 						onerror(r);
 						return;
 					}
-					callback(r.message.fileid, r.message.filename, r);
+					callback(r.message.fid, r.message.filename, r);
 					$(document).trigger("upload_complete", 
-						[r.message.fileid, r.message.filename]);
+						[r.message.fid, r.message.filename]);
 				}
 			});
 		}