diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f6d896..75e6dd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.1
+
+- Refactor on session generator
+
 ## 0.1.0
 
 - Move to Rollup 3
diff --git a/package-lock.json b/package-lock.json
index cc51449..109e3eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@aptabase/web",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@aptabase/web",
-      "version": "0.1.0",
+      "version": "0.1.1",
       "license": "MIT",
       "devDependencies": {
         "@rollup/plugin-replace": "5.0.2",
diff --git a/package.json b/package.json
index 5eeb621..808802e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aptabase/web",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "private": false,
   "type": "module",
   "description": "JavaScript SDK for Aptabase: Open Source, Privacy-First and Simple Analytics for Mobile, Desktop and Web Apps",
diff --git a/src/session.ts b/src/session.ts
index 0eef129..59b92b5 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -1,16 +1,20 @@
 export function newSessionId() {
-  if (typeof crypto !== "undefined" && crypto && window.crypto.randomUUID) {
-    return window.crypto.randomUUID();
+  if (typeof crypto !== "undefined" && crypto && crypto.randomUUID) {
+    return crypto.randomUUID();
   }
 
-  return `${randomString(8)}-${randomString(4)}-${randomString(
-    4
-  )}-${randomString(4)}-${randomString(12)}`;
+  return [
+    randomStr(8),
+    randomStr(4),
+    randomStr(4),
+    randomStr(4),
+    randomStr(12),
+  ].join("-");
 }
 
 const characters = "abcdefghijklmnopqrstuvwxyz0123456789";
 const charactersLength = characters.length;
-function randomString(len: number) {
+function randomStr(len: number) {
   let result = "";
   for (let i = 0; i < len; i++) {
     result += characters.charAt(Math.floor(Math.random() * charactersLength));