fixed save and init of data