diff --git a/app/controllers/dmsf_upload_controller.rb b/app/controllers/dmsf_upload_controller.rb
index 2cf7129f..8090e3f3 100644
--- a/app/controllers/dmsf_upload_controller.rb
+++ b/app/controllers/dmsf_upload_controller.rb
@@ -52,7 +52,7 @@ class DmsfUploadController < ApplicationController
       # plupload multi upload completed
       uploaded = params[:uploaded]
       if uploaded
-        uploaded.each_value do |uploaded_file|
+        uploaded.each do |_, uploaded_file|
           @uploads.push(DmsfUpload.new(@project, @folder, uploaded_file))
         end
       end
diff --git a/app/helpers/dmsf_upload_helper.rb b/app/helpers/dmsf_upload_helper.rb
index b6958c75..f5860daa 100644
--- a/app/helpers/dmsf_upload_helper.rb
+++ b/app/helpers/dmsf_upload_helper.rb
@@ -82,8 +82,10 @@ module DmsfUploadHelper
         new_revision.digest = DmsfFileRevision.create_digest commited_file[:tempfile_path]
 
         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]
+          i = 0
+          commited_file[:custom_field_values].each do |_, v|
+            new_revision.custom_field_values[i].value = v
+            i = i + 1
           end
         end