fix save override issue