For ENG-6546, fix a bug where the wrong JSON object was populated