diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb
index 277fa2fd..6d9487d7 100644
--- a/app/views/dmsf/show.html.erb
+++ b/app/views/dmsf/show.html.erb
@@ -154,8 +154,8 @@
 				<%= file.last_revision.updated_at.strftime("%Y-%m-%d %H:%M") %>
 				<% if file.locked_for_user? %>
 					<%= link_to(image_tag("locked.png", :plugin => :redmine_dmsf), 
-							{:controller => "users", :action => "show", :id => file.locks[0].user },
-							:title => l(:title_locked_by_user, :user => file.locks[0].user.to_s)) %>
+							{:controller => "users", :action => "show", :id => file.lock.reverse[0].user },
+							:title => l(:title_locked_by_user, :user => file.lock.reverse[0].user.to_s)) %>
         		<% elsif file.locked? %>
 					<%= image_tag("lockedbycurrent.png", :title => l(:title_locked_by_you), :plugin => :redmine_dmsf) %>
 				<% end %>
diff --git a/lib/redmine_dmsf/lockable.rb b/lib/redmine_dmsf/lockable.rb
index 3b0a7d9e..9a92354b 100644
--- a/lib/redmine_dmsf/lockable.rb
+++ b/lib/redmine_dmsf/lockable.rb
@@ -16,7 +16,7 @@ module RedmineDmsf
         }
       end
       if tree
-        ret = ret | (folder.locks || folder.lock) unless folder.nil?
+        ret = ret | (folder.locks.empty? ? folder.lock : folder.locks) unless folder.nil?
       end
       return ret
     end