diff --git a/src/jes/core/encoding.d b/src/jes/core/encoding.d
index 230c438..738b123 100644
--- a/src/jes/core/encoding.d
+++ b/src/jes/core/encoding.d
@@ -46,11 +46,6 @@ struct Encoding
         }
 
         /* No BOM found. Check heuristically. */
-        if (validate_utf8(data, n))
-        {
-            return Encoding(UTF8);
-        }
-
         if (check_utf16(data, n, true))
         {
             return Encoding(UTF16_LE);
@@ -61,6 +56,11 @@ struct Encoding
             return Encoding(UTF16_BE);
         }
 
+        if (validate_utf8(data, n))
+        {
+            return Encoding(UTF8);
+        }
+
         return Encoding(CP1252);
     }
 
@@ -136,7 +136,8 @@ struct Encoding
                 n_high_zeros++;
             }
         }
-        return (20u * n_high_zeros / n) != 0u;
+        /* 20% threshold of high zeroes required. */
+        return (40u * n_high_zeros / n) != 0u;
     }
 
     unittest