diff --git a/include/jemalloc/internal/extent.h b/include/jemalloc/internal/extent.h
index eeebdf0f..528759b0 100644
--- a/include/jemalloc/internal/extent.h
+++ b/include/jemalloc/internal/extent.h
@@ -227,22 +227,23 @@ JEMALLOC_INLINE void *
 extent_before_get(const extent_t *extent)
 {
 
-	return ((void *)((uintptr_t)extent->e_addr - PAGE));
+	return ((void *)((uintptr_t)extent_base_get(extent) - PAGE));
 }
 
 JEMALLOC_INLINE void *
 extent_last_get(const extent_t *extent)
 {
 
-	return ((void *)((uintptr_t)extent->e_addr + extent_size_get(extent) -
-	    PAGE));
+	return ((void *)((uintptr_t)extent_base_get(extent) +
+	    extent_size_get(extent) - PAGE));
 }
 
 JEMALLOC_INLINE void *
 extent_past_get(const extent_t *extent)
 {
 
-	return ((void *)((uintptr_t)extent->e_addr + extent_size_get(extent)));
+	return ((void *)((uintptr_t)extent_base_get(extent) +
+	    extent_size_get(extent)));
 }
 
 JEMALLOC_INLINE bool