fix bug
Merge branch 'v1-fix01' into v1