fix issues with chapter 7