Return back json crash fix, which has been lost in 3ffeecdb5d509eb072d0ab09cf350d92ca0b425c