minor-fix-for-json-refactoring