diff --git a/spec/ameba/rule/lint/unused_block_argument_spec.cr b/spec/ameba/rule/lint/unused_block_argument_spec.cr
index dbc95b8c..d5ad799c 100644
--- a/spec/ameba/rule/lint/unused_block_argument_spec.cr
+++ b/spec/ameba/rule/lint/unused_block_argument_spec.cr
@@ -38,7 +38,7 @@ module Ameba::Rule::Lint
     it "reports if block arg is not used" do
       source = expect_issue subject, <<-CRYSTAL
         def method(a, b, c, &block)
-                           # ^ error: Unused block argument `block`. [...]
+                           # ^^^^^ error: Unused block argument `block`. [...]
         end
         CRYSTAL
 
@@ -51,7 +51,7 @@ module Ameba::Rule::Lint
     it "reports if unused and there is yield" do
       source = expect_issue subject, <<-CRYSTAL
         def method(a, b, c, &block)
-                           # ^ error: Use `&` as an argument name to indicate that it won't be referenced.
+                           # ^^^^^ error: Use `&` as an argument name to indicate that it won't be referenced.
           3.times do |i|
             i.try do
               yield i
@@ -94,7 +94,7 @@ module Ameba::Rule::Lint
         source = expect_issue subject, <<-CRYSTAL
           class Bar < Foo
             def method(a, b, c, &block)
-                               # ^ error: Unused block argument `block`. [...]
+                               # ^^^^^ error: Unused block argument `block`. [...]
               super a, b, c
             end
           end
diff --git a/src/ameba/rule/lint/unused_block_argument.cr b/src/ameba/rule/lint/unused_block_argument.cr
index 0af82811..7fdb0f67 100644
--- a/src/ameba/rule/lint/unused_block_argument.cr
+++ b/src/ameba/rule/lint/unused_block_argument.cr
@@ -58,7 +58,7 @@ module Ameba::Rule::Lint
 
       if scope.yields?
         if location && end_location
-          issue_for block_arg.node, MSG_YIELDED do |corrector|
+          issue_for location, end_location, MSG_YIELDED do |corrector|
             corrector.remove(location, end_location)
           end
         else
@@ -67,7 +67,7 @@ module Ameba::Rule::Lint
       else
         return if block_arg.ignored?
         if location && end_location
-          issue_for block_arg.node, MSG_UNUSED % block_arg.name do |corrector|
+          issue_for location, end_location, MSG_UNUSED % block_arg.name do |corrector|
             corrector.insert_before(location, '_')
           end
         else