Hack: fix for IWebSocket issue