diff --git a/src/cairo-surface.c b/src/cairo-surface.c
index 78346c941..b3a48f134 100644
--- a/src/cairo-surface.c
+++ b/src/cairo-surface.c
@@ -651,7 +651,7 @@ cairo_surface_map_to_image (cairo_surface_t  *surface,
 						    _cairo_format_from_content (surface->content),
 						    extents->width,
 						    extents->height);
-	cairo_surface_set_device_offset (image, -extents->y, -extents->y);
+	cairo_surface_set_device_offset (image, -extents->x, -extents->y);
 
 	_cairo_pattern_init_for_surface (&pattern, surface);
 	pattern.base.filter = CAIRO_FILTER_NEAREST;
diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 1f9850826..322f92906 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -1281,7 +1281,7 @@ _cairo_xlib_surface_map_to_image (void                    *abstract_surface,
     cairo_surface_t *image;
 
     image = _get_image_surface (abstract_surface, extents);
-    cairo_surface_set_device_offset (image, -extents->y, -extents->y);
+    cairo_surface_set_device_offset (image, -extents->x, -extents->y);
 
     return image;
 }