add shape.
fix bug.