fix expand/collapse