fixed massive expand/collapse bug