Stash properly when updating