1 files changed, 3 insertions, 2 deletions
diff --git a/Master/texmf-dist/metapost/context/base/mpiv/mp-grap.mpiv b/Master/texmf-dist/metapost/context/base/mpiv/mp-grap.mpiv
index 3a1d7742ad6..e799f629c0f 100644
--- a/Master/texmf-dist/metapost/context/base/mpiv/mp-grap.mpiv
+++ b/Master/texmf-dist/metapost/context/base/mpiv/mp-grap.mpiv
@@ -199,7 +199,8 @@ def begingraph(expr w, h) =
           graph_number_of_arrowheads = 0 ;
 
   if known graph_background : % new feature!
-    fill origin--(w,0)--(w,h)--(0,h)--cycle withcolor graph_background ;
+    addto graph_finished_graph contour
+      origin--(w,0)--(w,h)--(0,h)--cycle withcolor graph_background ;
   fi
 enddef ;
 
@@ -863,7 +864,7 @@ vardef graph_gridline_picture@#(suffix $)(expr c, f, u)(text w) =
         if c : graph_xyscale fi
         shifted (((.5 + mfun_laboff@# dotprod (.5,.5)) * mfun_laboff@#) graph_xyscale) ;
     image(draw p w ;
-        label@#(if string f : format(f,u) else : f fi, point 0 of p))
+        label@#(if string f : format(f,u) else : f fi, point 0 of p) w)
   fi
 enddef ;