Fix json serialization consistency
Merge pull request #2075 from derekwaynecarr/issue_2070

Fix json serialization consistency