diff --git a/sys/kernel/descrip.c b/sys/kernel/descrip.c
index 26707d3..f2a0539 100644
--- a/sys/kernel/descrip.c
+++ b/sys/kernel/descrip.c
@@ -224,6 +224,7 @@
 
 int sys_select(struct thread *td, struct sys_select_args *args) {
   int error = 0x0;
+  /*
   int i = 0x0;
 
   fd_set sock_rfds;
@@ -276,6 +277,10 @@
     }
   }
 
+   */
+
+  if ((td->td_retval[0] = lwip_select(args->nd, args->in, args->ou, args->ex, args->tv)) == -1)
+    error = -1;
 
   return (error);
 }
diff --git a/sys/net/net/sys_arch.c b/sys/net/net/sys_arch.c
index 1eff086..e66b4f0 100644
--- a/sys/net/net/sys_arch.c
+++ b/sys/net/net/sys_arch.c
@@ -489,10 +489,17 @@
   int fd = 0x0;
   struct file *nfp = 0x0;
 
+  /*
   error = falloc(td, &nfp, &fd);
 
   if (error)
     return (error);
+   */
+
+  //MrOlsen
+  fd = lwip_socket(args->domain, args->type, args->protocol);
+
+  nfp = (struct file *) td->o_files[fd];
 
   nfp->socket = lwip_socket(args->domain, args->type, args->protocol);
   nfp->fd_type = 2;