fixed JSON support