Fixed JSON Parsing