Fix bug.
Merge branch 'wzp-local'