Added hack for websockets