Chapter 2: one more fix