fix save_load bugs