Fix bug with server json serialization