fix step3 bug
merge