diff --git a/lib/redmine/nested_set/issue_nested_set.rb b/lib/redmine/nested_set/issue_nested_set.rb
index 8655ee325..1b775c3bb 100644
--- a/lib/redmine/nested_set/issue_nested_set.rb
+++ b/lib/redmine/nested_set/issue_nested_set.rb
@@ -38,7 +38,7 @@ module Redmine
       def target_lft
         scope_for_max_rgt = self.class.where(:root_id => root_id).where(:parent_id => parent_id)
         if id
-          scope_for_max_rgt = scope_for_max_rgt.where("id < ?", id)
+          scope_for_max_rgt = scope_for_max_rgt.where(id: ...id)
         end
         max_rgt = scope_for_max_rgt.maximum(:rgt)
         if max_rgt
diff --git a/lib/redmine/nested_set/project_nested_set.rb b/lib/redmine/nested_set/project_nested_set.rb
index c3a095888..e34f9adf4 100644
--- a/lib/redmine/nested_set/project_nested_set.rb
+++ b/lib/redmine/nested_set/project_nested_set.rb
@@ -40,7 +40,7 @@ module Redmine
 
       def target_lft
         siblings_rgt =
-          self.class.where(:parent_id => parent_id).where("name < ?", name).maximum(:rgt)
+          self.class.where(:parent_id => parent_id).where(name: ...name).maximum(:rgt)
         if siblings_rgt
           siblings_rgt + 1
         elsif parent_id