better handling on saved var update