fix for stash rollback