fix extra uncollapsing