Actually fix issue #14, not #18.