Fix uncollapsing