diff --git a/ChangeLog b/ChangeLog
index a3b5e4c8ac..3a44071f9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 14 11:05:03 2011  Narihiro Nakamura  <narihiro@netlab.jp>
+
+	* gc.c (rb_gc_set_params): call initial_expand_heap if
+	  initial_heap_min_slots is set.
+
 Tue Jun 14 11:02:08 2011  Narihiro Nakamura  <narihiro@netlab.jp>
 
 	* gc.c: use size_t.
diff --git a/gc.c b/gc.c
index c933423e28..7bf2a123c3 100644
--- a/gc.c
+++ b/gc.c
@@ -430,6 +430,7 @@ rb_gc_set_params(void)
 	printf("heap_min_slots=%d (%d)\n", heap_min_slots_i, initial_heap_min_slots);
 	if (heap_min_slots_i > 0) {
 	    initial_heap_min_slots = heap_min_slots_i;
+            initial_expand_heap(&rb_objspace);
 	}
     }
 
@@ -441,7 +442,6 @@ rb_gc_set_params(void)
 	    initial_free_min = free_min_i;
 	}
     }
-    initial_expand_heap(&rb_objspace);
 }
 
 static void gc_sweep(rb_objspace_t *);