diff --git a/lib/KeyboardTranslator.cpp b/lib/KeyboardTranslator.cpp
index 7530421..46f035c 100644
--- a/lib/KeyboardTranslator.cpp
+++ b/lib/KeyboardTranslator.cpp
@@ -718,7 +718,7 @@ QByteArray KeyboardTranslator::Entry::unescape(const QByteArray& input) const
            }
 
            if ( escapedChar )
-               result.replace(i,charsToRemove,replacement);
+               result.replace(i,charsToRemove,replacement,1);
         }
     }
 
diff --git a/lib/Vt102Emulation.cpp b/lib/Vt102Emulation.cpp
index 3343571..da2b3d7 100644
--- a/lib/Vt102Emulation.cpp
+++ b/lib/Vt102Emulation.cpp
@@ -953,7 +953,7 @@ void Vt102Emulation::sendKeyEvent( QKeyEvent* event )
         }
         else if ( !entry.text().isEmpty() ) 
         {
-            textToSend += _codec->fromUnicode(entry.text(true,modifiers));
+            textToSend += entry.text(true,modifiers);
         }
         else if((modifiers & Qt::ControlModifier) && event->key() >= 0x40 && event->key() < 0x5f) {
             textToSend += (event->key() & 0x1f);