--- XML/Stream.pm.122	2004-09-08 13:30:22.000000000 +0200
+++ XML/Stream.pm	2004-10-30 03:23:26.000000000 +0200
@@ -1614,7 +1614,7 @@
         unless (($buff eq "") || !defined($status) || ($status == 0));
     if (defined($status) && ($status != 0))
     {
-        $buff = Encode::decode_utf8($buff);
+        Encode::_utf8_on($buff);
         return $buff;
     }
     #return $buff unless (!defined($status) || ($status == 0));
@@ -1658,7 +1658,15 @@
     {
         $self->debug(3,"Send: can_write");
         
-        $self->{SENDSTRING} = Encode::encode_utf8(join("",@_));
+        $self->{SENDSTRING} = join("",@_);
+        if (Encode::is_utf8($self->{SENDSTRING}))
+        {
+            Encode::_utf8_off($self->{SENDSTRING});
+        }
+        else
+        {
+            $self->{SENDSTRING} = Encode::encode_utf8($self->{SENDSTRING});
+        }
 
         $self->{SENDWRITTEN} = 0;
         $self->{SENDOFFSET} = 0;