diff --git a/packages/basic.gblib/services/GBVMService.ts b/packages/basic.gblib/services/GBVMService.ts
index 9f3ef199..b4c88b6d 100644
--- a/packages/basic.gblib/services/GBVMService.ts
+++ b/packages/basic.gblib/services/GBVMService.ts
@@ -243,7 +243,7 @@ export class GBVMService extends GBService {
           let obj = t.fields[key];
           obj.type = getTypeBasedOnCondition(obj.type);
           if (obj.type.key === "TABLE") {
-            obj.type.key = "INTEGER"
+            obj.type.key = "BIGINT"
             associations.push({ from: t.name, to: obj.type.name });
           }
           if (key.toLowerCase() === 'id') {
diff --git a/packages/basic.gblib/services/KeywordsExpressions.ts b/packages/basic.gblib/services/KeywordsExpressions.ts
index ca5feb1c..33426bc5 100644
--- a/packages/basic.gblib/services/KeywordsExpressions.ts
+++ b/packages/basic.gblib/services/KeywordsExpressions.ts
@@ -226,7 +226,7 @@ export class KeywordsExpressions {
       ($0, $1, $2) => {
         let tableName = /\s*FROM\s*(\w+\$*)/.exec($2)[1];
         let sql = `SELECT ${$2}`.replace(tableName, '?');
-        return `${$1} = await sys.executeSQL({pid: pid, data:${$1}, sql:"${sql}", tableName:"${tableName}"})\n`;
+        return `${$1} = await sys.executeSQL({pid: pid, data:${tableName}, sql:"${sql}"})\n`;
       }
     ];