Fixed so that it doesn't starve the server thread.