fixed collapse shit