Fixing CollapsableMixin