Resolve TODO from chapter 11.