diff --git a/src/xkb/XKBGeom.c b/src/xkb/XKBGeom.c
index e9e36d0c..2365f480 100644
--- a/src/xkb/XKBGeom.c
+++ b/src/xkb/XKBGeom.c
@@ -147,7 +147,7 @@ register int	i;
 XkbShapePtr	shape;
 XkbRowPtr	row;
 XkbDoodadPtr	doodad;
-XkbBoundsPtr	bounds,rbounds=NULL;
+XkbBoundsPtr	bounds,rbounds;
 
     if ((!geom)||(!section))
 	return False;
@@ -186,7 +186,7 @@ XkbBoundsPtr	bounds,rbounds=NULL;
 	    default:
 		tbounds.x1= tbounds.x2= doodad->any.left;
 		tbounds.y1= tbounds.y2= doodad->any.top;
-		break;
+		continue;
 	}
 	_XkbCheckBounds(bounds,rbounds->x1,rbounds->y1);
 	_XkbCheckBounds(bounds,rbounds->x2,rbounds->y2);