diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 9e825fcf6f..562b1e0814 100644
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -632,17 +632,7 @@ void wxPrintData::ConvertFromNative()
 
         if (devMode->dmDeviceName[0] != 0)
         {
-            // TODO: make this Unicode compatible
-            char buf[32];
-            int i = 0;
-            while (devMode->dmDeviceName[i] != 0)
-            {
-                buf[i] = devMode->dmDeviceName[i];
-                i ++;
-            }
-            buf[i] = 0;
-
-            m_printerName = buf;
+            m_printerName = devMode->dmDeviceName;
         }
 
         //// Colour