bug
management of stash