JSON compatibility fix.