Force JSON compliance
Update for 1.8.1