[BUGFIX] Fix json generation