Revert fixture change
Fix invalid cast bug when saving dictionaries back to name value fields