Second attempt at #125.

That's what I get for using Notepad.