Fix the loading of existing data