Fix issue with JSON and sort keys