diff --git a/src/popupmenu.c b/src/popupmenu.c
index f2e9f50..ea52d80 100644
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -434,10 +434,17 @@
     int		round;
     int		n;
 
-    int *ha = highlight_attr;
-    //			 "word"		"kind"		"extra text"
-    int	attrsNorm[3] = { ha[HLF_PNI],	ha[HLF_PNK],	ha[HLF_PNX] };
-    int	attrsSel[3] =  { ha[HLF_PSI],	ha[HLF_PSK],	ha[HLF_PSX] };
+    int		attrsNorm[3];
+    int		attrsSel[3];
+    // "word"
+    attrsNorm[0] = highlight_attr[HLF_PNI];
+    attrsSel[0] = highlight_attr[HLF_PSI];
+    // "kind"
+    attrsNorm[1] = highlight_attr[HLF_PNK];
+    attrsSel[1] = highlight_attr[HLF_PSK];
+    // "extra text"
+    attrsNorm[2] = highlight_attr[HLF_PNX];
+    attrsSel[2] = highlight_attr[HLF_PSX];
 
     if (call_update_screen)
     {
diff --git a/src/version.c b/src/version.c
index 7055dc1..cad03e6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1404,
+/**/
     1403,
 /**/
     1402,