[jsonbuilder] - do it properly ...
Merge pull request #4846 from Memphiz/fixjsonbuilder

[jsonbuilder] - do it properly ...