Fixed Collapse Bug