fixing stash issues