better pop handler setting