JSON Parse Error Fix 2

2nd attempt to fix the JSON stuff.