Committing fix for save and load.