Fixed JSON parsing