--- fribidi-0.19.4/bin/fribidi-main.c	2012-08-25 20:56:20.000000000 +0200
+++ fribidi-0.19.4/bin/fribidi-main.c	2012-12-06 16:10:38.936894816 +0100
@@ -519,7 +519,7 @@ 
 				  idx++;
 				}
 #endif /* !FRIBIDI_MAIN_USE_ICONV_H */
-			    if (wid < 0 && idx > st + 1)
+			    if (wid < 0 && idx - st > 1)
 			      idx--;
 			    inlen = idx - st;