Correctly handle wss