1 files changed, 3 insertions, 1 deletions
diff --git a/keywords.c b/keywords.c
index 9019b55..d0d0b4d 100644
--- a/keywords.c
+++ b/keywords.c
@@ -90,6 +90,8 @@ keywordlist *get_keywords(paragraph *source) {
     numberstate *n = number_init();
     int prevpara = para_NotParaType;
 
+    number_cfg(n, source);
+
     kl->nkeywords = 0;
     kl->size = 0;
     kl->keys = NULL;
@@ -112,7 +114,7 @@ keywordlist *get_keywords(paragraph *source) {
 		    kw->text = source->kwtext;
 		    kw->para = source;
 		    heap_add(kl, kw);
-		    p += ustrlen(p) + 1;
+		    p = uadv(p);
 		}
 	    }
 	} else {