chap1 some fix