fixing collapse stuff