Fix issue with JSON parsing