diff --git a/lib/core/dicts.py b/lib/core/dicts.py
index 9993cab51..b896ed81d 100644
--- a/lib/core/dicts.py
+++ b/lib/core/dicts.py
@@ -23,20 +23,20 @@ from lib.core.settings import DB2_ALIASES
 from lib.core.settings import HSQLDB_ALIASES
 
 FIREBIRD_TYPES = {
-                    "261": "BLOB",
-                    "14": "CHAR",
-                    "40": "CSTRING",
-                    "11": "D_FLOAT",
-                    "27": "DOUBLE",
-                    "10": "FLOAT",
-                    "16": "INT64",
-                    "8": "INTEGER",
-                    "9": "QUAD",
-                    "7": "SMALLINT",
-                    "12": "DATE",
-                    "13": "TIME",
-                    "35": "TIMESTAMP",
-                    "37": "VARCHAR",
+                    261: "BLOB",
+                    14: "CHAR",
+                    40: "CSTRING",
+                    11: "D_FLOAT",
+                    27: "DOUBLE",
+                    10: "FLOAT",
+                    16: "INT64",
+                    8: "INTEGER",
+                    9: "QUAD",
+                    7: "SMALLINT",
+                    12: "DATE",
+                    13: "TIME",
+                    35: "TIMESTAMP",
+                    37: "VARCHAR",
                 }
 
 SYBASE_TYPES = {
diff --git a/plugins/generic/databases.py b/plugins/generic/databases.py
index 1fa53bdbb..d35ff8b7a 100644
--- a/plugins/generic/databases.py
+++ b/plugins/generic/databases.py
@@ -582,7 +582,7 @@ class Databases:
                                     columns[name] = None
                                 else:
                                     if Backend.isDbms(DBMS.FIREBIRD):
-                                        columnData[1] = FIREBIRD_TYPES.get(columnData[1], columnData[1])
+                                        columnData[1] = FIREBIRD_TYPES.get(int(columnData[1]) if isinstance(columnData[1], basestring) and columnData[1].isdigit() else columnData[1], columnData[1])
 
                                     columns[name] = columnData[1]