fixed collapsing~