Chapter 8-fix