Index: fontmode.c
===================================================================
--- fontmode.c	(revision 7013)
+++ fontmode.c	(revision 7014)
@@ -111,7 +111,7 @@
 	lwidth = PCB->Data->Layer + 2;
 	lgrid = PCB->Data->Layer + 3;
 
-	font = &PCB->Font;
+	font = pcb_font(PCB, 0, 1);
 	for (s = 0; s <= PCB_MAX_FONTPOSITION; s++) {
 		pcb_coord_t ox = (s % 16 + 1) * CELL_SIZE;
 		pcb_coord_t oy = (s / 16 + 1) * CELL_SIZE;
@@ -169,7 +169,7 @@
 	gdl_iterator_t it;
 	pcb_layer_t *lfont, *lwidth;
 
-	font = &PCB->Font;
+	font = pcb_font(PCB, 0, 1);
 	lfont = PCB->Data->Layer + 0;
 	lwidth = PCB->Data->Layer + 2;
 
@@ -189,7 +189,7 @@
 		s = XYtoSym(x1, y1);
 		ox = (s % 16 + 1) * CELL_SIZE;
 		oy = (s / 16 + 1) * CELL_SIZE;
-		symbol = &PCB->Font.Symbol[s];
+		symbol = &font->Symbol[s];
 
 		x1 -= ox;
 		y1 -= oy;
@@ -212,7 +212,7 @@
 
 		s = XYtoSym(x1, y1);
 		ox = (s % 16 + 1) * CELL_SIZE;
-		symbol = &PCB->Font.Symbol[s];
+		symbol = &font->Symbol[s];
 
 		x1 -= ox;