ugly, partial fix
stash
stash