diff --git a/configure.ac b/configure.ac
index fcbfb6af..c9c0b649 100644
--- a/configure.ac
+++ b/configure.ac
@@ -361,7 +361,7 @@ if test "x$CURSES_LIB_WIDE" = "xyes" -a "x$ac_cv_func_mbtowc" = "xyes" -a "x$ac_
 then
 	AC_DEFINE(NANO_WIDE, 1, [Define this if your system has wide character support (a wide curses library, mbtowc(), wctomb(), and wcwidth()).])
 else
-	AC_MSG_WARN([No wide character support found.  nano will not be able to support UTF-8.])
+	AC_MSG_WARN([Insufficient wide character support found.  nano will not be able to support UTF-8.])
 fi
 
 AC_CONFIG_FILES([
diff --git a/src/winio.c b/src/winio.c
index c9937b6c..a61e660c 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -1937,7 +1937,7 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
 #endif
 		' '; 
 	    start_col++;
-	    while ((column + index) % tabsize) {
+	    while (start_col % tabsize != 0) {
 		converted[index++] = ' ';
 		start_col++;
 	    }