fix bugs with saving