JSON creation fixed