Fixed stash stuff