fix stashing and unify code paths