fix expand bug