diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
index 23eba4d5..22c8c060 100644
--- a/lib/libwebsockets.c
+++ b/lib/libwebsockets.c
@@ -75,7 +75,10 @@ lws_remove_from_timeout_list(struct lws *wsi)
 	if (!wsi->timeout_list_prev)
 		return;
 
+	if (wsi->timeout_list)
+		wsi->timeout_list->timeout_list_prev = wsi->timeout_list_prev;
 	*wsi->timeout_list_prev = wsi->timeout_list;
+
 	wsi->timeout_list_prev = NULL;
 	wsi->timeout_list = NULL;
 }
diff --git a/test-server/fuzxy.c b/test-server/fuzxy.c
index 8c77df94..4fd292c7 100644
--- a/test-server/fuzxy.c
+++ b/test-server/fuzxy.c
@@ -277,8 +277,8 @@ struct fuzxy_rule {
 };
 
 struct fuzxy_rule r = {
-		{ "Host:", "\x0d", "\xe0\x00\x0d" },
-		{ 5, 1, 3 },
+		{ "G", "E", "\xe0\x41\x42" },
+		{ 1, 1, 3 },
 		65536
 };