diff --git a/packages/basic.gblib/services/GBVMService.ts b/packages/basic.gblib/services/GBVMService.ts
index 1fced1c4..54a2a38b 100644
--- a/packages/basic.gblib/services/GBVMService.ts
+++ b/packages/basic.gblib/services/GBVMService.ts
@@ -347,19 +347,15 @@ export class GBVMService extends GBService {
       const items = text.match(/(".*?"|[^",\s]+)(?=\s*,|\s*$)/g);
 
       let i = 0;
+      let json = '{';
       names.forEach(name => {
         let value = items[i];
-
-        // Add string to JSON without quotes.
-
-        if (value && (value.charAt(0) === '"' || value.charAt(0) === '\'')) {
-          value = value.substr(1, value.length - 2);
-        }
-        ret[name] = value;
         i++;
+        json = `${json} "${name}": ${value} ${names.length == i ? '' : ','}`;
       });
+      json = `${json}}`
 
-      return JSON.stringify(ret);
+      return json;
     };
 
     // Keywords from General Bots BASIC.
@@ -665,6 +661,7 @@ export class GBVMService extends GBService {
     });
 
     code = code.replace(/(click)(\s*)(.*)/gi, ($0, $1, $2, $3) => {
+      // TODO: page is not string.
       const params = getParams('page,' + $3, ['handle', 'frameOrSelector', 'selector']);
       return `await wa.click (${params})\n`;
     });
diff --git a/packages/basic.gblib/services/SystemKeywords.ts b/packages/basic.gblib/services/SystemKeywords.ts
index e8919d56..80a23e37 100644
--- a/packages/basic.gblib/services/SystemKeywords.ts
+++ b/packages/basic.gblib/services/SystemKeywords.ts
@@ -781,7 +781,7 @@ export class SystemKeywords {
         .get();
 
       results = await client
-        .api(`${baseUrl}/drive/items/${document.id}/workbook/worksheets('${sheets.value[0].name}')/range(address='A1:Z${maxLines}')`)
+        .api(`${baseUrl}/drive/items/${document.id}/workbook/worksheets('${sheets.value[0].name}')/range(address='A1:CZ${maxLines}')`)
         .get();
 
       header = results.text[0];
@@ -1513,7 +1513,7 @@ export class SystemKeywords {
       .get();
 
     results = await client
-      .api(`${baseUrl}/drive/items/${document.id}/workbook/worksheets('${sheets.value[0].name}')/range(address='A1:Z${maxLines}')`)
+      .api(`${baseUrl}/drive/items/${document.id}/workbook/worksheets('${sheets.value[0].name}')/range(address='A1:CZ${maxLines}')`)
       .get();
 
     header = results.text[0];