diff --git a/Build/index.ts b/Build/index.ts
index 1f05ab20..df85b5f0 100644
--- a/Build/index.ts
+++ b/Build/index.ts
@@ -19,7 +19,8 @@ import { buildPublicHtml } from './build-public';
 import { TaskResult } from './lib/trace-runner';
 
 (async () => {
-  const buildInternalReverseChnCIDRWorker = new Worker(new URL('./workers/build-internal-reverse-chn-cidr-worker.ts', import.meta.url));
+  console.log('Bun version:', Bun.version);
+
   try {
     const downloadPreviousBuildPromise = downloadPreviousBuild();
     const downloadPublicSuffixListPromise = downloadPublicSuffixList();
@@ -49,11 +50,14 @@ import { TaskResult } from './lib/trace-runner';
     ]).then(() => buildInternalCDNDomains());
 
     const buildInternalReverseChnCIDRPromise = new Promise<TaskResult>(resolve => {
-      buildInternalReverseChnCIDRWorker.postMessage(null);
-      buildInternalReverseChnCIDRWorker.onmessage = (e: MessageEvent<TaskResult>) => {
+      const buildInternalReverseChnCIDRWorker = new Worker(new URL('./workers/build-internal-reverse-chn-cidr-worker.ts', import.meta.url));
+
+      const handleMessage = (e: MessageEvent<TaskResult>) => {
         buildInternalReverseChnCIDRWorker.terminate();
         resolve(e.data);
-      };
+      }
+
+      buildInternalReverseChnCIDRWorker.addEventListener('message', handleMessage);
     });
 
     const buildInternalChnDomainsPromise = buildInternalChnDomains();
diff --git a/Build/workers/build-internal-reverse-chn-cidr-worker.ts b/Build/workers/build-internal-reverse-chn-cidr-worker.ts
index d2f6ca43..562557e0 100644
--- a/Build/workers/build-internal-reverse-chn-cidr-worker.ts
+++ b/Build/workers/build-internal-reverse-chn-cidr-worker.ts
@@ -1,8 +1,5 @@
-declare const self: Worker;
-
-import { buildInternalReverseChnCIDR } from '../build-internal-reverse-chn-cidr';
-
-self.onmessage = async () => {
+(async () => {
+  const { buildInternalReverseChnCIDR } = await import('../build-internal-reverse-chn-cidr');
   const stat = await buildInternalReverseChnCIDR();
   postMessage(stat);
-};
+})();