diff --git a/dist/package-shared/functions/dsql/sql/sql-generator.js b/dist/package-shared/functions/dsql/sql/sql-generator.js
index 2efe642..ec916b1 100644
--- a/dist/package-shared/functions/dsql/sql/sql-generator.js
+++ b/dist/package-shared/functions/dsql/sql/sql-generator.js
@@ -148,7 +148,7 @@ function sqlGenerator({ tableName, genObject, dbFullName, count }) {
         else if ((_a = genObject === null || genObject === void 0 ? void 0 : genObject.selectFields) === null || _a === void 0 ? void 0 : _a[0]) {
             if (genObject.join) {
                 str += ` ${(_b = genObject.selectFields) === null || _b === void 0 ? void 0 : _b.map((fld) => typeof fld == "object"
-                    ? `${finalDbName}${tableName}.${fld.fieldName}` +
+                    ? `${finalDbName}${tableName}.${fld.fieldName.toString()}` +
                         fld.alias
                         ? ` as ${fld.alias}`
                         : ``
@@ -156,7 +156,7 @@ function sqlGenerator({ tableName, genObject, dbFullName, count }) {
             }
             else {
                 str += ` ${(_c = genObject.selectFields) === null || _c === void 0 ? void 0 : _c.map((fld) => typeof fld == "object"
-                    ? `${fld.fieldName}` + fld.alias
+                    ? `${fld.fieldName.toString()}` + fld.alias
                         ? ` as ${fld.alias}`
                         : ``
                     : fld).join(",")}`;
diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts
index 98970d1..5c787ad 100644
--- a/dist/package-shared/types/index.d.ts
+++ b/dist/package-shared/types/index.d.ts
@@ -810,7 +810,7 @@ export type ServerQueryParam<T extends {
 } = {
     [k: string]: any;
 }, K extends string = string> = {
-    selectFields?: (keyof T | TableSelectFieldsObject)[];
+    selectFields?: (keyof T | TableSelectFieldsObject<T>)[];
     omitFields?: (keyof T)[];
     query?: ServerQueryQueryObject<T>;
     limit?: number;
diff --git a/package-shared/functions/dsql/sql/sql-generator.ts b/package-shared/functions/dsql/sql/sql-generator.ts
index 64daea3..4910651 100644
--- a/package-shared/functions/dsql/sql/sql-generator.ts
+++ b/package-shared/functions/dsql/sql/sql-generator.ts
@@ -210,7 +210,7 @@ export default function sqlGenerator<
                 str += ` ${genObject.selectFields
                     ?.map((fld) =>
                         typeof fld == "object"
-                            ? `${finalDbName}${tableName}.${fld.fieldName}` +
+                            ? `${finalDbName}${tableName}.${fld.fieldName.toString()}` +
                               fld.alias
                                 ? ` as ${fld.alias}`
                                 : ``
@@ -221,7 +221,7 @@ export default function sqlGenerator<
                 str += ` ${genObject.selectFields
                     ?.map((fld) =>
                         typeof fld == "object"
-                            ? `${fld.fieldName}` + fld.alias
+                            ? `${fld.fieldName.toString()}` + fld.alias
                                 ? ` as ${fld.alias}`
                                 : ``
                             : fld
diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts
index 170c0e7..c6a5e2f 100644
--- a/package-shared/types/index.ts
+++ b/package-shared/types/index.ts
@@ -995,7 +995,7 @@ export type ServerQueryParam<
     T extends { [k: string]: any } = { [k: string]: any },
     K extends string = string
 > = {
-    selectFields?: (keyof T | TableSelectFieldsObject)[];
+    selectFields?: (keyof T | TableSelectFieldsObject<T>)[];
     omitFields?: (keyof T)[];
     query?: ServerQueryQueryObject<T>;
     limit?: number;
diff --git a/package.json b/package.json
index 6fa974b..c6815ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "5.3.0",
+    "version": "5.3.1",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {