Fixed problems with WebSocket Handler