fix collapse
almost done [ci skip]