diff --git a/lib/client/autoform-file.coffee b/lib/client/autoform-file.coffee
index deb017c..e36b51b 100644
--- a/lib/client/autoform-file.coffee
+++ b/lib/client/autoform-file.coffee
@@ -16,14 +16,6 @@ Template.afFileUpload.onCreated ->
   self = @
   @value = new ReactiveVar @data.value
 
-  @_stopInterceptValue = false
-  @_interceptValue = (ctx) =>
-    unless @_stopInterceptValue
-      t = Template.instance()
-      if t.value.get() isnt false and t.value.get() isnt ctx.value and ctx.value?.length > 0
-        t.value.set ctx.value
-        @_stopInterceptValue = true
-
   @_insert = (file) ->
     collection = getCollection self.data
 
@@ -67,7 +59,6 @@ Template.afFileUpload.helpers
     file: getDocument @
     atts: @atts
   file: ->
-    Template.instance()._interceptValue @
     getDocument @
   removeFileBtnTemplate: ->
     @atts?.removeFileBtnTemplate or 'afFileRemoveFileBtnTemplate'
diff --git a/lib/client/autoform-file.html b/lib/client/autoform-file.html
index 564baa3..e130129 100644
--- a/lib/client/autoform-file.html
+++ b/lib/client/autoform-file.html
@@ -31,10 +31,10 @@
 </template>
 
 <template name="afFileSelectFileBtnTemplate">
-  <button type="button" class="btn btn-default af-select-file js-af-select-file">
+  <span class="btn btn-default af-select-file js-af-select-file">
     {{label}}
     <input type="file" class="js-file" accept="{{accept}}">
-  </button>
+  </span>
 </template>
 
 <template name="afFileUploadProgress">