cp-epoll further fix