fix chapter 1 ~ 2.15