#238 Stash changes