diff --git a/numeric.c b/numeric.c
index b191b25d79..7489d96dd2 100644
--- a/numeric.c
+++ b/numeric.c
@@ -3056,7 +3056,7 @@ num_step(int argc, VALUE *argv, VALUE from)
                                     num_step_size, from, to, step, FALSE);
         }
 
-        return SIZED_ENUMERATOR(from, 2, ((VALUE [2]){to, step}), num_step_size);
+        return SIZED_ENUMERATOR_KW(from, 2, ((VALUE [2]){to, step}), num_step_size, FALSE);
     }
 
     desc = num_step_scan_args(argc, argv, &to, &step, TRUE, FALSE);
diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb
index 0593cb535d..ab492743f6 100644
--- a/test/ruby/test_numeric.rb
+++ b/test/ruby/test_numeric.rb
@@ -324,6 +324,9 @@ class TestNumeric < Test::Unit::TestCase
     e = 1.step(10, {by: "1"})
     assert_raise(TypeError) {e.next}
     assert_raise(TypeError) {e.size}
+    e = 1.step(to: "10")
+    assert_raise(ArgumentError) {e.next}
+    assert_raise(ArgumentError) {e.size}
 
     assert_equal(bignum*2+1, (-bignum).step(bignum, 1).size)
     assert_equal(bignum*2, (-bignum).step(bignum-1, 1).size)
diff --git a/version.h b/version.h
index 9664aefc20..919aed6bb5 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 36
+#define RUBY_PATCHLEVEL 37
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"