--- /mnt/shrdfs/home/hvv/src/free/wv/text.c	Fri Nov 17 14:11:06 2000
+++ text.c	Fri Nov 17 20:51:52 2000
@@ -349,19 +349,19 @@
 
     wv_iconv(iconv_handle, &ibuf, &ibuflen, &obuf, &obuflen);
 
+    obuf = buffer2;
 #ifdef WV_SWAP_ICONV
-    if(swap_iconv_u2n(lid))
+    if(!swap_iconv_u2n(lid))
       {
         brute[0] = obuf[0];
         brute[1] = obuf[1];
-        eachchar = (U16) *brute;
       }
     else
       {
         brute[1] = obuf[0];
         brute[0] = obuf[1];
-        eachchar = (U16) *brute;
       }
+    eachchar = *(U16*)brute;      
 #else
     eachchar = (U16)*p;
 #endif /* WV_SWAP_ICONV */