Chapter 4 - fixes #3.