fix in json: now with keys