Fix JSON Marshalling over websocket