some fix for chapter 2