Fix for storage of fields