Fixed issue with JSON parsing