diff --git a/README.md b/README.md
index 48ba0f0..2afe7de 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ You can also download all development versions from [Bintray](https://bintray.co
 * When using reporters for Sonar or Coveralls client needs to be invoked from project's root directory.
 * Due to Oracle license we can't ship the necessary oracle libraries directly with utPLSQL-cli. <b>Please download the libraries directly from oracle website and put the jars into the "lib" folder of your utPLSQL-cli installation</b>
   * Oracle `ojdbc8` driver
-  * If you are on a 11g database with non standard NLS settings, you will also need the `orai18n` library.
+  * It is highly recommended that you also use the `orai18n` library, especially if you use a charset different than UTF-16 or are on Oracle 11g.
   * All of the above can be downloaded from [Oracle download site](http://www.oracle.com/technetwork/database/features/jdbc/jdbc-ucp-122-3110062.html)
 
 ## Compatibility
diff --git a/src/main/java/org/utplsql/cli/RunCommandChecker.java b/src/main/java/org/utplsql/cli/RunCommandChecker.java
index ed9d43d..36c90fc 100644
--- a/src/main/java/org/utplsql/cli/RunCommandChecker.java
+++ b/src/main/java/org/utplsql/cli/RunCommandChecker.java
@@ -18,11 +18,10 @@ class RunCommandChecker {
      */
     static void checkOracleI18nExists(Connection con) throws SQLException {
 
-        String oracleDatabaseVersion = DBHelper.getOracleDatabaseVersion(con);
-        if ( oracleDatabaseVersion.startsWith("11.") && !OracleLibraryChecker.checkOrai18nExists() )
+        if ( !OracleLibraryChecker.checkOrai18nExists() )
         {
-            System.out.println("Warning: Could not find Oracle i18n driver in classpath. Depending on the database charset " +
-                    "utPLSQL-cli might not run properly. It is recommended you download " +
+            System.out.println("WARNING: Could not find Oracle i18n driver in classpath. Depending on the database charset " +
+                    "utPLSQL-cli, especially code coverage, might not run properly. It is recommended you download " +
                     "the i18n driver from the Oracle website and copy it to the 'lib' folder of your utPLSQL-cli installation.");
             System.out.println("Download from http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-112010-090769.html");
         }