try fix pop state