fix(collapsible) A more elegant solution to cover issues 82 and 90