fix for over-aggressive PushPopCollapser