add type 1 and fix bug.