fixed: WebSockets + new changes