Better fix for websocket handling
Avoid interrupting