Fixed Client JSON parsing