Chapter 3? Fixes #2.