Fixed commit chapter 8