+onExpand fix