Avoid interrupting
Better fix for websocket handling