Fix for JSON nightmare