Fix a risk of pop-up pile up