fixed popup and currentperson