Updated to actually fix stupid JSON parsing bug