fix popState