fixed ExpandAll