improve web socket support