Fix bug:178-180:add expand()