fixed save and load events