One more JSON tweak