Fixed JSON Reader for now