diff --git a/CHANGES b/CHANGES
index c84bfea..573ef1c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+corrections:
+	corrected the "fixed possible SIGSEGV" fix because SIGSEGV still might
+	occur under those conditions. Thanks to Toni Mattila for first
+	reporting this problem.
+
 ####################### V 2.0.0-b7:
 
 security:
diff --git a/xio-listen.c b/xio-listen.c
index 684b5f6..88c21a6 100644
--- a/xio-listen.c
+++ b/xio-listen.c
@@ -226,8 +226,10 @@ int _xioopen_listen(struct single *xfd, int xioflags, struct sockaddr *us, sockl
       char peername[256];
       char sockname[256];
       int ps;		/* peer socket */
-      salen = sizeof(struct sockaddr);
 
+      pa = &_peername;
+      la = &_sockname;
+      salen = sizeof(struct sockaddr);
       do {
 	 /*? int level = E_ERROR;*/
 	 Notice1("listening on %s", sockaddr_info(us, uslen, lisname, sizeof(lisname)));