Fix for estimated charges json error (and potentially others)
[delivers #58463246]