Issue #8: Possible issue and possible fix in websocket handling (by celeron55)