- Fixing for mappings that were trying to save internal objects