diff --git a/ChangeLog b/ChangeLog
index 7a55e498e3..d9b4ce9be1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov  9 09:22:29 2013  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* gc.c (gc_page_sweep, rgengc_rememberset_mark): Refactoring.
+	  Get bitmaps directly.
+
 Sat Nov  9 09:16:36 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
 	* gc.c (RVALUE_PROMOTE_INFANT): Refactoring. Remove duplicated nonsense
diff --git a/gc.c b/gc.c
index 4fb2a3c5d0..55e2153dae 100644
--- a/gc.c
+++ b/gc.c
@@ -2662,7 +2662,7 @@ gc_page_sweep(rb_objspace_t *objspace, rb_heap_t *heap, struct heap_page *sweep_
 
     p = sweep_page->start; pend = p + sweep_page->limit;
     offset = p - NUM_IN_PAGE(p);
-    bits = GET_HEAP_MARK_BITS(p);
+    bits = sweep_page->mark_bits;
 
     /* create guard : fill 1 out-of-range */
     bits[BITMAP_INDEX(p)] |= BITMAP_BIT(p)-1;
@@ -4478,7 +4478,7 @@ rgengc_rememberset_mark(rb_objspace_t *objspace, rb_heap_t *heap)
 
     while (page) {
 	p = page->start;
-	bits = GET_HEAP_REMEMBERSET_BITS(p);
+	bits = page->rememberset_bits;
 	offset = p - NUM_IN_PAGE(p);
 
 	for (j=0; j < HEAP_BITMAP_LIMIT; j++) {