Fixed JS and JSON