diff --git a/src/getchar.c b/src/getchar.c
index 4f5ea46..e42fc33 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2044,10 +2044,12 @@
 	    // illegal argument or getchar(0) and no char avail: return zero
 	    n = 0;
 	else
-	    // getchar(0) and char avail: return char
-	    n = plain_vgetc();
+	    // getchar(0) and char avail() != NUL: get a character.
+	    // Note that vpeekc_any() returns K_SPECIAL for K_IGNORE.
+	    n = safe_vgetc();
 
-	if (n == K_IGNORE || n == K_MOUSEMOVE)
+	if (n == K_IGNORE || n == K_MOUSEMOVE
+		|| n == K_VER_SCROLLBAR || n == K_HOR_SCROLLBAR)
 	    continue;
 	break;
     }
diff --git a/src/version.c b/src/version.c
index c306c88..e1cdba6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1608,
+/**/
     1607,
 /**/
     1606,