Trying to fix the weirdness with websockets