Fix for chapter 8.5