Fixes differences in Json between 5.3 and 5.4