diff --git a/ChangeLog b/ChangeLog
index 0dd40026c7..0cb90b31d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 30 21:54:01 2017  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_insert): check position to insert even if no elements
+	  to be inserted. [Bug #13558]
+
 Fri Jun 30 21:51:40 2017  Marcus Stollsteimer  <sto.mar@web.de>
 
 	* ext/date/date_core.c: [DOC] fix documentation for %Z format of
diff --git a/array.c b/array.c
index 3bd267a51f..de81ee7fab 100644
--- a/array.c
+++ b/array.c
@@ -1766,8 +1766,8 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
 
     rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
     rb_ary_modify_check(ary);
-    if (argc == 1) return ary;
     pos = NUM2LONG(argv[0]);
+    if (argc == 1) return ary;
     if (pos == -1) {
 	pos = RARRAY_LEN(ary);
     }
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index 753c34b2cf..26bf942c61 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -2063,6 +2063,7 @@ class TestArray < Test::Unit::TestCase
     assert_equal([0], a.insert(1))
     assert_equal([0, 1], a.insert(1, 1))
     assert_raise(ArgumentError) { a.insert }
+    assert_raise(TypeError) { a.insert(Object.new) }
     assert_equal([0, 1, 2], a.insert(-1, 2))
     assert_equal([0, 1, 3, 2], a.insert(-2, 3))
     assert_raise(RuntimeError) { [0].freeze.insert(0)}
diff --git a/version.h b/version.h
index ed33160a9a..5e2cb95d50 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.5"
 #define RUBY_RELEASE_DATE "2017-06-30"
-#define RUBY_PATCHLEVEL 334
+#define RUBY_PATCHLEVEL 335
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 6