diff --git a/src/com/jsaasta/froj/stdlib/socket/ClientHandler.java b/src/com/jsaasta/froj/stdlib/socket/ClientHandler.java
index e005504..a671887 100644
--- a/src/com/jsaasta/froj/stdlib/socket/ClientHandler.java
+++ b/src/com/jsaasta/froj/stdlib/socket/ClientHandler.java
@@ -5,7 +5,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
 
-class ClientHandler extends Thread {
+class ClientHandler implements Runnable {
     private Socket socket;
 
     public ClientHandler(Socket socket) {
diff --git a/src/com/jsaasta/froj/stdlib/socket/SocketServer.java b/src/com/jsaasta/froj/stdlib/socket/SocketServer.java
index 8e55653..d4357d6 100644
--- a/src/com/jsaasta/froj/stdlib/socket/SocketServer.java
+++ b/src/com/jsaasta/froj/stdlib/socket/SocketServer.java
@@ -35,7 +35,7 @@ public class SocketServer implements FrojCallable {
                 System.out.println("Incoming connection from " + socket.getInetAddress());
 
                 ClientHandler clientHandler = new ClientHandler(socket);
-                clientHandler.start();
+                clientHandler.run();
                 String nextMessage = getNextMessage();
                 if(nextMessage.toLowerCase().contentEquals("exit")){
                     shutdown();