fixed stupid popup stuff