fix collapsing