JSON parsing fixed