Fix for json converter