added trick for stashes