diff --git a/data/xml/queries.xml b/data/xml/queries.xml
index 6ac58b7f6..172403379 100644
--- a/data/xml/queries.xml
+++ b/data/xml/queries.xml
@@ -440,8 +440,8 @@
 
    <dbms value="Firebird">
         <!--Firebird doesn't like big VARCHARs-->
-        <cast query="TRIM(CAST(%s AS VARCHAR(8000)))"/>
-        <length query="CHAR_LENGTH(TRIM(%s))"/>
+        <cast query="TRIM(TRAILING FROM CAST(%s AS VARCHAR(8000)))"/>
+        <length query="CHAR_LENGTH(TRIM(TRAILING FROM %s))"/>
         <delimiter query="||"/>
         <limit query="ROWS %d TO %d"/>
         <limitregexp query="\s+ROWS\s+([\d]+)(\s+TO\s+([\d]+))?"/>
@@ -1026,7 +1026,7 @@
    </dbms>
 
     <dbms value="Vertica">
-        <cast query="CAST(%s AS CHARACTER(10000))"/>
+        <cast query="CAST(%s AS VARCHAR(10000))"/>
         <length query="LENGTH(%s)"/>
         <isnull query="COALESCE(%s,' ')"/>
         <delimiter query="||"/>
diff --git a/lib/core/settings.py b/lib/core/settings.py
index deab36185..4b234d5e0 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -20,7 +20,7 @@ from lib.core.enums import OS
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.10.7.200"
+VERSION = "1.10.7.201"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)