Fix for source saving fields for multiple source types. Still needs
testing.