Changed the way collapseStatus is found