pop state fixes