Fix to saving