diff --git a/src/array.c b/src/array.c
index a72a7e2c3..82c4625bd 100644
--- a/src/array.c
+++ b/src/array.c
@@ -1107,20 +1107,30 @@ static mrb_value
 mrb_ary_eql(mrb_state *mrb, mrb_value ary1)
 {
   mrb_value ary2;
+  mrb_bool eql_p;
 
   mrb_get_args(mrb, "o", &ary2);
-  if (mrb_obj_equal(mrb, ary1, ary2)) return mrb_true_value();
-  if (!mrb_array_p(ary2)) return mrb_false_value();
-  if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return mrb_false_value();
+  if (mrb_obj_equal(mrb, ary1, ary2)) {
+    eql_p = 1;
+  }
+  else if (!mrb_array_p(ary2)) {
+    eql_p = 0;
+  }
+  else if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) {
+    eql_p = 0;
+  }
   else {
     mrb_int i;
-
+    eql_p = 1;
     for (i=0; i<RARRAY_LEN(ary1); i++) {
-      if (!mrb_eql(mrb, ary_elt(ary1, i), ary_elt(ary2, i)))
-        return mrb_false_value();
+      if (!mrb_eql(mrb, ary_elt(ary1, i), ary_elt(ary2, i))) {
+	eql_p = 0;
+	break;
+      }
     }
-    return mrb_true_value();
   }
+
+  return mrb_true_or_false_value(eql_p);
 }
 
 void