fix bug
first step ok
merge