diff --git a/src/adql/translator/PostgreSQLTranslator.java b/src/adql/translator/PostgreSQLTranslator.java
index 8e3b9225ab17a109a2894d34f798cba3c5a83bc4..e20690de4f6cc7bf71eec3b448f5f66549c4bcbc 100644
--- a/src/adql/translator/PostgreSQLTranslator.java
+++ b/src/adql/translator/PostgreSQLTranslator.java
@@ -16,7 +16,7 @@ package adql.translator;
  * You should have received a copy of the GNU Lesser General Public License
  * along with ADQLLibrary.  If not, see <http://www.gnu.org/licenses/>.
  * 
- * Copyright 2012-2015 - UDS/Centre de Données astronomiques de Strasbourg (CDS),
+ * Copyright 2012-2016 - UDS/Centre de Données astronomiques de Strasbourg (CDS),
  *                       Astronomisches Rechen Institut (ARI)
  */
 
@@ -50,7 +50,7 @@ import adql.query.operand.function.geometry.RegionFunction;
  * </i></p>
  * 
  * @author Gr&eacute;gory Mantelet (CDS;ARI)
- * @version 1.4 (12/2015)
+ * @version 1.4 (08/2016)
  * 
  * @see PgSphereTranslator
  */
@@ -77,7 +77,7 @@ public class PostgreSQLTranslator extends JDBCTranslator {
 	 * Builds a PostgreSQLTranslator which always translates in SQL all identifiers (schema, table and column) in the specified case sensitivity ;
 	 * in other words, schema, table and column names will all be surrounded or not by double quotes in the SQL translation.
 	 * 
-	 * @param allCaseSensitive	<i>true</i> to translate all identifiers in a case sensitive manner (surrounded by double quotes), <i>false</i> for case insensitivity. 
+	 * @param allCaseSensitive	<i>true</i> to translate all identifiers in a case sensitive manner (surrounded by double quotes), <i>false</i> for case insensitivity.
 	 */
 	public PostgreSQLTranslator(final boolean allCaseSensitive){
 		caseSensitivity = allCaseSensitive ? (byte)0x0F : (byte)0x00;
@@ -241,7 +241,7 @@ public class PostgreSQLTranslator extends JDBCTranslator {
 		else if (dbmsTypeName.equals("real") || dbmsTypeName.equals("float4"))
 			return new DBType(DBDatatype.REAL);
 		// DOUBLE
-		else if (dbmsTypeName.equals("double precision") || dbmsTypeName.equals("float8"))
+		else if (dbmsTypeName.equals("double precision") || dbmsTypeName.equals("float8") || dbmsTypeName.equals("numeric"))
 			return new DBType(DBDatatype.DOUBLE);
 		// BINARY
 		else if (dbmsTypeName.equals("bit"))
diff --git a/src/tap/data/ResultSetTableIterator.java b/src/tap/data/ResultSetTableIterator.java
index c3ecf6f3aa9fcb0a6f0607b6ef52b986ce0fa053..bee5725ae798b216b5393efc6d82affa973cbc8b 100644
--- a/src/tap/data/ResultSetTableIterator.java
+++ b/src/tap/data/ResultSetTableIterator.java
@@ -43,7 +43,7 @@ import uws.ISO8601Format;
  * </i></p>
  * 
  * @author Gr&eacute;gory Mantelet (ARI)
- * @version 2.1 (04/2016)
+ * @version 2.1 (08/2016)
  * @since 2.0
  */
 public class ResultSetTableIterator implements TableIterator {
@@ -779,7 +779,7 @@ public class ResultSetTableIterator implements TableIterator {
 			dbType = translator.convertTypeFromDB(dbmsType, dbmsTypeName, dbmsTypePrefix, typeParams);
 
 		// And if unsuccessful, apply a default conversion:
-		if (dbType == null)
+		if (dbType == null || dbType.isUnknown())
 			dbType = defaultTypeConversion(dbmsTypePrefix, typeParams, dbms);
 
 		return dbType;
@@ -861,7 +861,7 @@ public class ResultSetTableIterator implements TableIterator {
 			else if (dbmsTypeName.equals("real") || dbmsTypeName.equals("float4") || (dbmsTypeName.equals("float") && lengthParam <= 63))
 				return new DBType(DBDatatype.REAL);
 			// DOUBLE
-			else if (dbmsTypeName.equals("double") || dbmsTypeName.equals("double precision") || dbmsTypeName.equals("float8") || (dbmsTypeName.equals("float") && lengthParam > 63))
+			else if (dbmsTypeName.equals("double") || dbmsTypeName.equals("double precision") || dbmsTypeName.equals("float8") || (dbmsTypeName.equals("float") && lengthParam > 63) || dbmsTypeName.equals("numeric"))
 				return new DBType(DBDatatype.DOUBLE);
 			// BINARY
 			else if (dbmsTypeName.equals("bit") || dbmsTypeName.equals("binary") || dbmsTypeName.equals("raw") || ((dbmsTypeName.equals("char") || dbmsTypeName.equals("character")) && dbmsTypeName.endsWith(" for bit data")))