fix popup errors
fix popup errors