Make pop removal more reliable