Collapse bug fix