collapsable mixin fix