stash and fixed a bug