and fix bug.