Second attempt to fix collapsible active status