is_expandable class fix