Fix for JSON issues ... only 3 days waisted