diff --git a/DeleteSamples.py b/DeleteSamples.py
index 23d7974c..4f644ff9 100755
--- a/DeleteSamples.py
+++ b/DeleteSamples.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-#-*- coding: iso-8859-15 -*-
 #
 ##############################################################################
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
diff --git a/ResetDateTime.py b/ResetDateTime.py
index c7b477fc..1a99a3f5 100755
--- a/ResetDateTime.py
+++ b/ResetDateTime.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-#-*- coding: iso-8859-15 -*-
 #
 ##############################################################################
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
diff --git a/TorrentToMedia.py b/TorrentToMedia.py
index eba46582..ec8404d4 100755
--- a/TorrentToMedia.py
+++ b/TorrentToMedia.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-#-*- coding: iso-8859-15 -*-
 import datetime
 import os
 import time
diff --git a/nzbToCouchPotato.py b/nzbToCouchPotato.py
index ca1f8d95..c37d82ee 100755
--- a/nzbToCouchPotato.py
+++ b/nzbToCouchPotato.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-#-*- coding: iso-8859-15 -*-
 #
 ##############################################################################
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
diff --git a/nzbToGamez.py b/nzbToGamez.py
index 4dd3d0de..2f1208f6 100755
--- a/nzbToGamez.py
+++ b/nzbToGamez.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-#-*- coding: iso-8859-15 -*-
 #
 ##############################################################################
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
diff --git a/nzbToHeadPhones.py b/nzbToHeadPhones.py
index 066d2770..ce7b654a 100755
--- a/nzbToHeadPhones.py
+++ b/nzbToHeadPhones.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-#-*- coding: iso-8859-15 -*-
 #
 ##############################################################################
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
diff --git a/nzbToMedia.py b/nzbToMedia.py
index 63c4278c..f0c1231b 100755
--- a/nzbToMedia.py
+++ b/nzbToMedia.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-#-*- coding: iso-8859-15 -*-
 #
 ##############################################################################
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
diff --git a/nzbToMylar.py b/nzbToMylar.py
index cf235f2d..9a9d31bc 100755
--- a/nzbToMylar.py
+++ b/nzbToMylar.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-#-*- coding: iso-8859-15 -*-
 #
 ##############################################################################
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
diff --git a/nzbToNzbDrone.py b/nzbToNzbDrone.py
index 31bf6c25..709435d0 100755
--- a/nzbToNzbDrone.py
+++ b/nzbToNzbDrone.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-#-*- coding: iso-8859-15 -*-
 #
 ##############################################################################
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
diff --git a/nzbToSickBeard.py b/nzbToSickBeard.py
index 253cf86a..afee486b 100755
--- a/nzbToSickBeard.py
+++ b/nzbToSickBeard.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-#-*- coding: iso-8859-15 -*-
 #
 ##############################################################################
 ### NZBGET POST-PROCESSING SCRIPT                                          ###
diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py
index 5b2f6781..f9ae1329 100644
--- a/nzbtomedia/nzbToMediaUtil.py
+++ b/nzbtomedia/nzbToMediaUtil.py
@@ -316,40 +316,35 @@ def CharReplace(fileDirName):
     # The function will detect if fileDirName contains a special character
     # If there is special character, detects if it is a UTF-8, CP850 or ISO-8859-15 encoding
     encodingDetected = False
-    # parsing all files/directories in odrer to detect if CP850 is used
+    if isinstance(fileDirName, unicode)
+        return encodingDetected fileDirName.encode('utf-8')
     for Idx in range(len(fileDirName)):
-        encodingDetected = False
         # /!\ detection is done 2char by 2char for UTF-8 special character
         if (len(fileDirName) != 1) & (Idx < (len(fileDirName) - 1)):
             # Detect UTF-8
             if ((fileDirName[Idx] == '\xC2') | (fileDirName[Idx] == '\xC3')) & ((fileDirName[Idx+1] >= '\xA0') & (fileDirName[Idx+1] <= '\xFF')):
-                utf8Name = fileDirName
-                break;
+                break
             # Detect CP850
             elif ((fileDirName[Idx] >= '\x80') & (fileDirName[Idx] <= '\xA5')):
-                utf8Name = fileDirName.decode('cp850')
-                utf8Name = utf8Name.encode('utf-8')
+                utf8Name = fileDirName.decode('cp850').encode('utf-8')
                 encodingDetected = True
-                break;
+                break
             # Detect ISO-8859-15
             elif (fileDirName[Idx] >= '\xA6') & (fileDirName[Idx] <= '\xFF'):
-                utf8Name = fileDirName.decode('iso-8859-15')
-                utf8Name = utf8Name.encode('utf-8')
+                utf8Name = fileDirName.decode('iso-8859-15').encode('utf-8')
                 encodingDetected = True
-                break;
+                break
         else:
             # Detect CP850
             if ((fileDirName[Idx] >= '\x80') & (fileDirName[Idx] <= '\xA5')):
-                utf8Name = fileDirName.decode('cp850')
-                utf8Name = utf8Name.encode('utf-8')
+                utf8Name = fileDirName.decode('cp850').encode('utf-8')
                 encodingDetected = True
-                break;
+                break
             # Detect ISO-8859-15
             elif (fileDirName[Idx] >= '\xA6') & (fileDirName[Idx] <= '\xFF'):
-                utf8Name = fileDirName.decode('iso-8859-15')
-                utf8Name = utf8Name.encode('utf-8')
+                utf8Name = fileDirName.decode('iso-8859-15').encode('utf-8')
                 encodingDetected = True
-                break;
+                break
     if encodingDetected == False:
         utf8Name = fileDirName
     return encodingDetected, utf8Name