diff --git a/app/helpers/dmsf_upload_helper.rb b/app/helpers/dmsf_upload_helper.rb
index e13ce77d..6648e938 100644
--- a/app/helpers/dmsf_upload_helper.rb
+++ b/app/helpers/dmsf_upload_helper.rb
@@ -85,14 +85,14 @@ module DmsfUploadHelper
         new_revision.size = File.size(commited_disk_filepath)
         new_revision.digest = DmsfFileRevision.create_digest commited_disk_filepath
 
-        # Need to save file first to generate id for it in case of creation.
-        # File id is needed to properly generate revision disk filename
-        if commited_file[:dmsf_file_revision].present?
-          commited_file[:dmsf_file_revision][:custom_field_values].each_with_index do |v, i|
+        if commited_file[:custom_field_values].present?
+          commited_file[:custom_field_values].each_with_index do |v, i|
             new_revision.custom_field_values[i].value = v[1]
           end
         end
 
+        # Need to save file first to generate id for it in case of creation.
+        # File id is needed to properly generate revision disk filename
         if new_revision.valid? && file.save
           new_revision.disk_filename = new_revision.new_storage_filename
         else
diff --git a/app/views/dmsf_upload/_upload_file.html.erb b/app/views/dmsf_upload/_upload_file.html.erb
index 64aa3825..3c8effb3 100644
--- a/app/views/dmsf_upload/_upload_file.html.erb
+++ b/app/views/dmsf_upload/_upload_file.html.erb
@@ -47,7 +47,7 @@
     <div class="splitcontentright">
       <div class="custom_fields">
         <% upload.custom_values.each do |value| %>
-            <p><%= custom_field_tag_with_label("commited_files[#{i}][dmsf_file_revision]", value) %></p>
+            <p><%= custom_field_tag_with_label "commited_files[#{i}]", value %></p>
         <% end %>
       </div>
     </div>