diff --git a/java/src/main/java/com/genexus/db/driver/GXDBMShana.java b/java/src/main/java/com/genexus/db/driver/GXDBMShana.java
index 5860b31d7..a9a5a9d2e 100644
--- a/java/src/main/java/com/genexus/db/driver/GXDBMShana.java
+++ b/java/src/main/java/com/genexus/db/driver/GXDBMShana.java
@@ -130,7 +130,7 @@ public void onConnection(GXConnection con) throws SQLException
 
 	public java.util.Date serverDateTime(GXConnection con) throws SQLException
 	{
-		ResultSet rslt = con.getStatement("_ServerDT_", "SELECT NOW()", false).executeQuery();
+		ResultSet rslt = con.getStatement("_ServerDT_", "SELECT CURRENT_TIMESTAMP FROM DUMMY", false).executeQuery();
 
 		rslt.next();
 		Date value = rslt.getTimestamp(1);
@@ -141,7 +141,7 @@ public java.util.Date serverDateTime(GXConnection con) throws SQLException
 	
 	public String serverVersion(GXConnection con) throws SQLException
 	{
-		ResultSet rslt = con.getStatement("_ServerVERSION_", "SELECT VERSION()", false).executeQuery();
+		ResultSet rslt = con.getStatement("_ServerVERSION_", "SELECT VERSION FROM M_DATABASE", false).executeQuery();
 		
 		rslt.next();
 		String value = rslt.getString(1);
@@ -154,7 +154,7 @@ public String connectionPhysicalId(GXConnection con)
 	{
 		try
 		{
-			ResultSet rslt = con.getStatement("_ConnectionID_", "SELECT CONNECTION_ID()", false).executeQuery();
+			ResultSet rslt = con.getStatement("_ConnectionID_", "SELECT CURRENT_CONNECTION FROM DUMMY", false).executeQuery();
 
 			rslt.next();
 			String value = rslt.getString(1);