Fixed JSON parser issue