Unbroke expand/collapse