Fixed save and load with new code.