diff --git a/src/cindent.c b/src/cindent.c
index 6289422..cf18441 100644
--- a/src/cindent.c
+++ b/src/cindent.c
@@ -4108,7 +4108,8 @@
 		}
 		else
 		    // TODO: multi-byte
-		    if (keytyped == (int)p[-1] || (icase && keytyped < 256
+		    if (keytyped == (int)p[-1] || (icase
+				&& keytyped < 256 && keytyped >= 0
 			 && TOLOWER_LOC(keytyped) == TOLOWER_LOC((int)p[-1])))
 		{
 		    line = ml_get_cursor();
diff --git a/src/version.c b/src/version.c
index b221faa..562ba13 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    22,
+/**/
     21,
 /**/
     20,