fixing save issues