Index: shape.c
===================================================================
--- shape.c	(revision 24882)
+++ shape.c	(revision 24883)
@@ -561,7 +561,7 @@
 		return 0;
 	}
 
-	if ((dia < 1) || (dia > (PCB->MaxWidth + PCB->MaxHeight)/4)) {
+	if ((dia < 1) || (dia > (PCB->hidlib.size_x + PCB->hidlib.size_y)/4)) {
 		pcb_message(PCB_MSG_ERROR, "circle(): invalid diameter\n");
 		PCB_ACT_IRES(1);
 		return 0;
Index: shape_dialog.c
===================================================================
--- shape_dialog.c	(revision 24882)
+++ shape_dialog.c	(revision 24883)
@@ -103,7 +103,7 @@
 	ctx_t *shp = caller_data;
 	pcb_coord_t dia = shp->dlg[shp->dia].default_val.coord_value;
 
-	if ((dia < 1) || (dia > (PCB->MaxWidth + PCB->MaxHeight)/4)) {
+	if ((dia < 1) || (dia > (PCB->hidlib.size_x + PCB->hidlib.size_y)/4)) {
 		pcb_message(PCB_MSG_ERROR, "Invalid diameter.\n");
 		return;
 	}