- fix popup and spot bug