diff --git a/untar-worker.js b/untar-worker.js
index 8b4b432..833e196 100644
--- a/untar-worker.js
+++ b/untar-worker.js
@@ -1,7 +1,11 @@
-/* globals postMessage: false, DataView: false, self: false */
+/* globals postMessage: false, DataView: false, self: false, onmessage: true */
 /* jshint -W097 */
 "use strict";
 
+onmessage = function(e) {
+	postMessage("test");
+};
+
 self.onmessage = function(msg) {
 	postLog("info", "Received message.");
 	try {
@@ -158,6 +162,4 @@ TarFileStream.prototype = {
 
 		return file;
 	}
-};
-
-postMessage({ type: "ready" });
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/untar.js b/untar.js
index cf89724..fa5809e 100644
--- a/untar.js
+++ b/untar.js
@@ -99,25 +99,6 @@ function untar(source, options) {
 
 		var worker = new Worker(workerScriptUri);
 
-		function initWorker() {
-			// Is source a string? Then assume it's a URL and download it.
-			if (typeof source === "string") {
-				loadArrayBuffer(source).then(
-					function(buffer) {
-						console.info("Loaded tar file, extracting.");
-						worker.postMessage({ type: "extract", buffer: buffer }, [buffer]);
-					},
-					function(err) {
-						onError(err);
-						reject(err);
-					}
-				);
-			} else {
-				console.info("Extracting tar file.");
-				worker.postMessage({ type: "extract", buffer: source }, [source]);
-			}
-		}
-
 		var files = [];
 		var msgData;
 
@@ -125,10 +106,6 @@ function untar(source, options) {
 			message = message.data;
 
 			switch (message.type) {
-				case "ready":
-					console.info("Worker is ready.");
-					initWorker();
-					break;
 				case "log":
 					console[message.data.level]("Worker: " + message.data.msg);
 					break;
@@ -156,6 +133,22 @@ function untar(source, options) {
 					break;
 			}
 		};
+
+		if (typeof source === "string") {
+			loadArrayBuffer(source).then(
+				function(buffer) {
+					console.info("Loaded tar file, sending to worker for extraction.");
+					worker.postMessage({ type: "extract", buffer: buffer }, [buffer]);
+				},
+				function(err) {
+					onError(err);
+					reject(err);
+				}
+			);
+		} else {
+			console.info("Sending tar file to worker for extraction.");
+			worker.postMessage({ type: "extract", buffer: source }, [source]);
+		}
 	});
 }