Fix Bug of expand
merge