expandable fixes