Fixed JSON weirdness