Index: parametric/common_subc.awk
===================================================================
--- parametric/common_subc.awk	(revision 27221)
+++ parametric/common_subc.awk	(revision 27222)
@@ -552,12 +552,12 @@
 	subc_pstk_add_shape_square_corners(proto, "top-copper", -w, -h, +w, +h)
 
 	if (mask_offs != "none") {
-		m = pad_paste_offs(mask_offs) / 2
+		m = pad_paste_offs(w, mask_offs) / 2
 		subc_pstk_add_shape_square_corners(proto, "top-mask", -w-m, -h-m, +w+m, +h+m)
 	}
 
 	if (paste_offs != "none") {
-		p = pad_paste_offs(paste_offs) / 2
+		p = pad_paste_offs(w, paste_offs) / 2
 		subc_pstk_add_shape_square_corners(proto, "top-paste", -w-p, -h-p, +w+p, +h+p)
 	}
 
Index: parametric/qf.awk
===================================================================
--- parametric/qf.awk	(revision 27221)
+++ parametric/qf.awk	(revision 27222)
@@ -121,7 +121,7 @@
 		}
 
 #		center pad
-		cpad_proto = subc_proto_create_pad_rect(cpad_width, cpad_height, cpad_mask, "none")
+		cpad_proto = subc_proto_create_pad_rect(cpad_width, cpad_height, cpad_mask == "" ? 0 : cpad_mask, "none")
 		subc_pstk(cpad_proto, cpx, cpy, 0, cpadid)
 		dimension(cpx-cpad_width/2, cpy-cpad_height/2, cpx+cpad_width/2, cpy-cpad_height/2, "@0;" (height * -0.6-ext_bloat), "cpad_width")
 		dimension(cpx+cpad_width/2, cpy-cpad_height/2, cpx+cpad_width/2, cpy+cpad_height/2, "@" (width * 0.8+ext_bloat) ";0", "cpad_height")