Add length of columns, and fix a bug.
Merge branch 'wzp-local'